slack-ruby-bot-server 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2baab12040f4100e3fb8ece5469b8b4ed6616f2
-  data.tar.gz: 45d3c6c0c456033a0a1c799ab71c298b3b7d72b6
+  metadata.gz: '08d2ca6a35e52167fede4422f6f7cb4e436aaf78'
+  data.tar.gz: 580793c0cddae73b27ddc7f65d26208d2b16bb1e
 SHA512:
-  metadata.gz: fced549dc1ec1f687223b076c6c73d50e5d14fd1976dcf007f392beb8b9e7f0b2c0519d011acbd1d20db7a86e3cee58b3974f0f444c1013d5edb10e8501f593e
-  data.tar.gz: 383451e38ac282f35ee977179a2e20a1df09ba40664cb2c38dd1a28d5fa1cc28bbf31de19c0bdfe2682df4d7f003d788983927f5973d0fbcc8356add93475f2a
+  metadata.gz: f17072e2f9db331a104cf2b6ab1a111f90177240bd5c73eeb69d65673797cbc305913c7845e0d4d0693eededa00f85d51cd064fcf2ef76eb539ae50f90bf2dc8
+  data.tar.gz: 3136311a0f290eb8f714a8e7dab0fc5e65e02eaba7281dc05de1486c1b3d948f056f2cfe48c1de8f7395e3a4c5626ca0f61e5742c2f9ceb535024f0a7ee8913d

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ### Changelog
 
+#### 0.8.1 (2018/9/20)
+
+* [#79](https://github.com/slack-ruby/slack-ruby-bot-server/pull/79): Fix: ping worker terminates on a failed restart - [@dblock](https://github.com/dblock).
+
 #### 0.8.0 (2018/9/8)
 
 * [#75](https://github.com/slack-ruby/slack-ruby-bot-server/pull/75): Default to `async-websocket` instead of `celluloid-io` - [@dblock](https://github.com/dblock).

data/README.md

@@ -13,7 +13,7 @@ A library that contains a [Grape](http://github.com/ruby-grape/grape) API servin
 
 ### Stable Release
 
-You're reading the documentation for the **stable** release of slack-ruby-bot-server, v0.8.0. See [UPGRADING](UPGRADING.md) when upgrading from an older version.
+You're reading the documentation for the **stable** release of slack-ruby-bot-server, 0.8.1. See [UPGRADING](UPGRADING.md) when upgrading from an older version.
 
 ### Try Me
 

data/lib/slack-ruby-bot-server/ping.rb

@@ -68,20 +68,43 @@ module SlackRubyBotServer
       @error_count += 1
       return true if retries_left?
       restart!
-      false
     end
 
     def restart!
       logger.warn "RESTART: #{owner}"
-      begin
-        connection.close
-      rescue Async::Wrapper::Cancelled
-        # ignore, from connection.close
-      end
+      close_connection
+      close_driver
+      emit_close
+      false
+    rescue StandardError => e
+      logger.warn "Error restarting team #{owner.id}: #{e.message}."
+      true
+    end
+
+    def close_connection
+      return unless connection
+      connection.close
+    rescue Async::Wrapper::Cancelled
+      # ignore, from connection.close
+    rescue StandardError => e
+      logger.warn "Error closing connection for #{owner.id}: #{e.message}."
+      raise e
+    end
+
+    def close_driver
+      return unless driver
       driver.close
+    rescue StandardError => e
+      logger.warn "Error closing driver for #{owner.id}: #{e.message}."
+      raise e
+    end
+
+    def emit_close
+      return unless driver
       driver.emit(:close, WebSocket::Driver::CloseEvent.new(1001, 'bot offline'))
     rescue StandardError => e
-      logger.warn "Error restarting team #{owner.id}: #{e.message}."
+      logger.warn "Error sending :close event to driver for #{owner.id}: #{e.message}."
+      raise e
     end
 
     def ping_interval
@@ -89,11 +112,11 @@ module SlackRubyBotServer
     end
 
     def retries_left?
-      retries_left >= 0
+      retry_count - error_count >= 0
     end
 
     def retries_left
-      retry_count - error_count
+      [0, retry_count - error_count].max
     end
 
     def retry_count

data/lib/slack-ruby-bot-server/version.rb

@@ -1,3 +1,3 @@
 module SlackRubyBotServer
-  VERSION = '0.8.0'.freeze
+  VERSION = '0.8.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-ruby-bot-server
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Daniel Doubrovkine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-08 00:00:00.000000000 Z
+date: 2018-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-websocket
@@ -295,7 +295,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A Grape API serving a Slack bot to multiple teams.