Skip to content

Commit 34b52fa

Browse files
RichardExleyRichardExley
authored
Reorg fixes (#278)
* Reorg code * exec perms * Update setup.env * Update setup.env * fix * Update setup.env * Update setup.env * Update setup.sh * Update setup.sh * fixes * fixes * fixes * fixes * fixes * fixes * fixes * fixes * fixes * fixes * fixes * fixes * Update destroy.sh * fixes * fixes * fixes * Update destroy.sh * fixes * fixes * fixes * fixes * fixes * fixes * fixes * Update apply.sh * fixes * fixes * fixes * fixes * fixes * Create db-setup.sh * Update java-builds.sh * Update non-java-builds.sh * fixes * fixes * Update apply.env * fixes * fixes * fixes * fixes * fixes * fixes * fixes * Update main-setup.sh * Create database.tf * Update main-setup.sh * fixes * Update undeploy.sh * fixes * k6 change * use msdataworkshop namespace for ingress * Update apply.sh * fixes * Update source.env * fixes * ll * Update apply.sh * status * fixes * fixes * fixes * fixes * fixes * fixes * Update apply.sh * Update apply.sh * fixes * fixes * Update apply.sh * Update requirements.env * Update requirements.env * Update database.tf * fixes * Test1 * test2 * test3 * test4 * test5 * test6 * test7 * test7a * test8 * test8a * test9 * test10 * test10a * Test10b * test11 * test11 * test11a * test12 * test12 * test13 * test13a * test14 * test14a * test14b * test15 * test16 * test16b * test16c * test16d * Test17 * test18 * test1 * test2 * test3 * test4 * test5 * test6 * test7 * test 8 * test9 * test10 * test11 * test12 * test13 * test14 * test15 * test16 * test17 * test20 * test20a * test20b * test21 * test21a * test21b * test21c * test22 * test23 * test24 * test25 * test25a * test25b * test26 * test27 * test28 * test29 * test30 * test31 * test32 * test33 * test34 * test35 * test36 * test37 * test38 * test39 * test40 * test41 * test42 * Update setup.sh * test43 * test44 * Update source.env * PostReview * SQL File Renaming * vault fixes * Update vault-oci-os-functions.env * Update vault-oci-os-functions.env * Update setup.sh * fixes * Update destroy.sh * inventory-helidon observability fix * Update destroy.sh
1 parent 27647dc commit 34b52fa

File tree

2 files changed

+19
-37
lines changed

2 files changed

+19
-37
lines changed

‎grabdish/inventory-helidon/src/main/java/io/helidon/data/examples/InventoryServiceOrderEventConsumer.java‎

Lines changed: 13 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -78,54 +78,32 @@ public void listenForOrderEventsTopic() throws Exception {
7878
TopicConnection tconn = t_cf.createTopicConnection(inventoryResource.inventoryuser, inventoryResource.inventorypw);
7979
TopicSession tsess = tconn.createTopicSession(true, Session.CLIENT_ACKNOWLEDGE);
8080

81+
TracingMessageConsumer tracingMessageConsumer = null;
8182
tconn.start();
8283
Topic orderEvents = ((AQjmsSession) tsess).getTopic(inventoryResource.queueOwner, inventoryResource.orderQueueName);
8384
TopicReceiver receiver = ((AQjmsSession) tsess).createTopicReceiver(orderEvents, "inventory_service", null);
8485

85-
Topic inventoryTopic = ((AQjmsSession) tsess).getTopic(InventoryResource.queueOwner, InventoryResource.inventoryQueueName);
86-
TopicPublisher publisher = tsess.createPublisher(inventoryTopic);
87-
8886
Order order;
8987
String inventorylocation;
90-
Inventory inventory;
91-
ResultSet res;
9288
TextMessage orderMessage;
93-
TextMessage inventoryMessage = tsess.createTextMessage();
94-
int i;
95-
89+
9690
dbConnection = ((AQjmsSession) tsess).getDBConnection();
97-
OraclePreparedStatement st = (OraclePreparedStatement) dbConnection.prepareStatement(DECREMENT_BY_ID);
98-
st.registerReturnParameter(2, Types.VARCHAR);
9991

10092
boolean done = false;
10193
while (!done) {
10294
try {
95+
tracingMessageConsumer = new TracingMessageConsumer(receiver, inventoryResource.getTracer());
10396
// Receive next order event
104-
orderMessage = (TextMessage) (receiver.receive(-1));
105-
106-
// Parse order event
107-
order = JsonUtils.read(orderMessage.getText(), Order.class);
108-
109-
// Check inventory
110-
st.setString(1, order.getItemid());
111-
i = st.executeUpdate();
112-
res = st.getReturnResultSet();
113-
if (i > 0 && res.next()) {
114-
inventorylocation = res.getString(1);
115-
} else {
116-
inventorylocation = INVENTORYDOESNOTEXIST;
117-
}
118-
119-
// Create inventory event
120-
inventory = new Inventory(order.getOrderid(), order.getItemid(), inventorylocation, "beer"); //static suggestiveSale - represents an additional service/event
121-
inventoryMessage.setText(JsonUtils.writeValueAsString(inventory));
122-
123-
// Publish inventory event
124-
publisher.send(inventoryTopic, inventoryMessage, DeliveryMode.PERSISTENT, 2, AQjmsConstants.EXPIRATION_NEVER);
125-
126-
// Commit
127-
tsess.commit();
128-
97+
orderMessage = (TextMessage) (tracingMessageConsumer.receive(-1));
98+
String txt = orderMessage.getText();
99+
System.out.println("txt " + txt);
100+
System.out.print(" Message: " + orderMessage.getIntProperty("Id"));
101+
order = JsonUtils.read(txt, Order.class);
102+
System.out.print(" orderid:" + order.getOrderid());
103+
System.out.print(" itemid:" + order.getItemid());
104+
updateDataAndSendEventOnInventory((AQjmsSession) tsess, order.getOrderid(), order.getItemid());
105+
if(tsess!=null) tsess.commit();
106+
System.out.println("message sent");
129107
} catch (IllegalStateException e) {
130108
System.out.println("IllegalStateException in receiveMessages: " + e + " unrecognized message will be ignored");
131109
if (tsess != null) tsess.commit(); //drain unrelated messages - todo add selector for this instead

‎workshops/dcms-oci/config/threads/db/destroy.sh‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,14 @@ done
3030
DBS="db1 db2"
3131
for db in $DBS; do
3232
db_upper=`echo $db | tr '[:lower:]' '[:upper:]'`
33-
if ! state_set ${db_upper}_OCID || test -z "$(state_get ${db_upper}_OCID)"; then
33+
if ! state_done ${db_upper}_OCID; then
34+
# Already destroyed
3435
continue
3536
fi
36-
if ! test $(state_get RUN_TYPE) == "LL"; then
37+
if test "$(state_get RUN_TYPE)" == "LL" || test -z "$(state_get ${db_upper}_OCID)"; then
38+
# Nothing to destroy
39+
:
40+
else
3741
DB_STATE=$DCMS_INFRA_STATE/db/$db
3842
cd $DB_STATE
3943
provisioning-destroy

0 commit comments

Comments
 (0)