Merge pull request #298 from jayjanssen/slack_reconnect

Slack reconnect cleanup
howdyai · Aug 13, 2016 · 857fc15 · 857fc15
2 parents ea0bc59 + e2da914
commit 857fc15
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lib/Slackbot_worker.js b/lib/Slackbot_worker.js
@@ -18,7 +18,6 @@ module.exports = function(botkit, config) {
     };
 
     var pingIntervalId = null;
-    var lastPong = 0;
     var retryBackoff = null;
 
     // config.retry, can be Infinity too
@@ -69,7 +68,6 @@ module.exports = function(botkit, config) {
             clearInterval(pingIntervalId);
         }
 
-        lastPong = 0;
         botkit.trigger('rtm_close', [bot, err]);
 
         // only retry, if enabled, when there was an error
@@ -118,6 +116,7 @@ module.exports = function(botkit, config) {
     };
 
     bot.startRTM = function(cb) {
+        var lastPong = 0;
         bot.api.rtm.start({
             no_unreads: true,
             simple_latest: true,
@@ -163,7 +162,9 @@ module.exports = function(botkit, config) {
                 pingIntervalId = setInterval(function() {
                     if (lastPong && lastPong + 12000 < Date.now()) {
                         var err = new Error('Stale RTM connection, closing RTM');
+                        botkit.log.error(err)
                         bot.closeRTM(err);
+                        clearInterval(pingIntervalId);
                         return;
                     }