update subscription index&filter

awslabs · Nov 24, 2023 · a6c78b0 · a6c78b0
1 parent d09633a
commit a6c78b0
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/canary/mqtt5/canary.ts b/canary/mqtt5/canary.ts
@@ -121,21 +121,20 @@ async function doSubscribe(context: CanaryContext) {
             ]
         });
 
-        context.subscriptions[index].push(topicFilter);
-        context.mqttStats.subscribesSucceeded++;
     } catch (err) {
         context.mqttStats.subscribesFailed++;
-        if(context.subscriptions[index].length > 0 )
-            context.subscriptions[index].filter(entry => entry !== topicFilter);
+        return;
     }
+
+    context.subscriptions[index].push(topicFilter);
+    context.mqttStats.subscribesSucceeded++;
 }
 
 async function doUnsubscribe(context: CanaryContext) {
+    let index = getRandomIndex(context.clients);
     if (context.subscriptions.length == 0) {
         return;
     }
-
-    let index = getRandomIndex(context.clients);
     let topicFilter: string = context.subscriptions[index].pop() ?? "canthappen";
 
     try {