about summary refs log tree commit diff
path: root/streaming
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2020-08-12 15:36:07 +0200
committerStarfall <us@starfall.systems>2020-08-25 13:36:49 -0500
commit1bf109bc7c722114b7db27c1a0bc1ad322f30c2d (patch)
tree97a1707608063b86690a025e509aa8a290070d1c /streaming
parentf2099bcc533a221a597fabc585ddfe7f295db851 (diff)
Fix destructuring error when unsubscribing without subscribing (#14566)
Diffstat (limited to 'streaming')
-rw-r--r--streaming/index.js9
1 files changed, 6 insertions, 3 deletions
diff --git a/streaming/index.js b/streaming/index.js
index f5c9b4224..3a68e6de5 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -210,6 +210,7 @@ const startWorker = (workerId) => {
     if (subs[channel].length === 0) {
       log.verbose(`Unsubscribe ${channel}`);
       redisSubscribeClient.unsubscribe(channel);
+      delete subs[channel];
     }
   };
 
@@ -888,19 +889,21 @@ const startWorker = (workerId) => {
     channelNameToIds(request, channelName, params).then(({ channelIds }) => {
       log.verbose(request.requestId, `Ending stream from ${channelIds.join(', ')} for ${request.accountId}`);
 
-      const { listener, stopHeartbeat } = subscriptions[channelIds.join(';')];
+      const subscription = subscriptions[channelIds.join(';')];
 
-      if (!listener) {
+      if (!subscription) {
         return;
       }
 
+      const { listener, stopHeartbeat } = subscription;
+
       channelIds.forEach(channelId => {
         unsubscribe(`${redisPrefix}${channelId}`, listener);
       });
 
       stopHeartbeat();
 
-      subscriptions[channelIds.join(';')] = undefined;
+      delete subscriptions[channelIds.join(';')];
     }).catch(err => {
       log.verbose(request.requestId, 'Unsubscription error:', err);
       socket.send(JSON.stringify({ error: err.toString() }));