From f62821f2cbb9b1a92e8b81fa7c94a4d932d0b73e Mon Sep 17 00:00:00 2001 From: Brad Harris Date: Mon, 6 Jun 2016 09:38:54 -0600 Subject: [PATCH 1/3] logging close error code/message and reconnecting for now --- lib/Slackbot_worker.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/Slackbot_worker.js b/lib/Slackbot_worker.js index 28cee1b89..e593cb5db 100755 --- a/lib/Slackbot_worker.js +++ b/lib/Slackbot_worker.js @@ -204,11 +204,14 @@ module.exports = function(botkit, config) { botkit.trigger('rtm_close', [bot, err]); }); - bot.rtm.on('close', function() { + bot.rtm.on('close', function(code, message) { + botkit.log.error('RTM close event: ' + code + ' : ' + message); if (pingIntervalId) { clearInterval(pingIntervalId); } botkit.trigger('rtm_close', [bot]); + + reconnect(); }); }); From c5e9d989996200afbd01ed70e264bf82929d8839 Mon Sep 17 00:00:00 2001 From: Brad Harris Date: Sat, 11 Jun 2016 17:04:04 -0600 Subject: [PATCH 2/3] limiting reconnect during close event to abnormal closes --- lib/Slackbot_worker.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/Slackbot_worker.js b/lib/Slackbot_worker.js index e593cb5db..30dc152a6 100755 --- a/lib/Slackbot_worker.js +++ b/lib/Slackbot_worker.js @@ -158,6 +158,7 @@ module.exports = function(botkit, config) { }); bot.rtm.on('open', function() { + botkit.log.notice('RTM websocket opened'); pingIntervalId = setInterval(function() { if (lastPong && lastPong + 12000 < Date.now()) { @@ -205,13 +206,17 @@ module.exports = function(botkit, config) { }); bot.rtm.on('close', function(code, message) { - botkit.log.error('RTM close event: ' + code + ' : ' + message); + botkit.log.notice('RTM close event: ' + code + ' : ' + message); if (pingIntervalId) { clearInterval(pingIntervalId); } botkit.trigger('rtm_close', [bot]); - reconnect(); + // CLOSE_ABNORMAL error - wasn't closed explicitly, should attempt to reconnect + if (code === 1006) { + botkit.log.error('Abnormal websocket close event, attempting to reconnect'); + reconnect(); + } }); }); From c380c28bac82e3a10cf435035949f7d795228916 Mon Sep 17 00:00:00 2001 From: Brad Harris Date: Sat, 11 Jun 2016 17:41:30 -0600 Subject: [PATCH 3/3] changing comment to jsdoc --- lib/Slackbot_worker.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/Slackbot_worker.js b/lib/Slackbot_worker.js index 30dc152a6..868901724 100755 --- a/lib/Slackbot_worker.js +++ b/lib/Slackbot_worker.js @@ -212,7 +212,10 @@ module.exports = function(botkit, config) { } botkit.trigger('rtm_close', [bot]); - // CLOSE_ABNORMAL error - wasn't closed explicitly, should attempt to reconnect + /** + * CLOSE_ABNORMAL error + * wasn't closed explicitly, should attempt to reconnect + */ if (code === 1006) { botkit.log.error('Abnormal websocket close event, attempting to reconnect'); reconnect();