Close socket, not driver.

Author: dblock

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2018-08-27 14:23:13 +0200 using RuboCop version 0.58.2.
+# on 2018-09-08 18:09:56 -0400 using RuboCop version 0.58.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -16,6 +16,11 @@ Layout/IndentHeredoc:
     - 'sample_apps/sample_app_activerecord/commands/help.rb'
     - 'sample_apps/sample_app_mongoid/commands/help.rb'
 
+# Offense count: 1
+Lint/HandleExceptions:
+  Exclude:
+    - 'lib/slack-ruby-bot-server/ping.rb'
+
 # Offense count: 3
 # Configuration parameters: Blacklist.
 # Blacklist: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))

Gemfile

@@ -16,9 +16,6 @@ else
   warn "Invalid ENV['DATABASE_ADAPTER']: #{ENV['DATABASE_ADAPTER']}."
 end
 
-gem 'slack-ruby-bot', github: 'dblock/slack-ruby-bot', branch: 'async'
-gem 'slack-ruby-client', github: 'dblock/slack-ruby-client', branch: 'async'
-
 gemspec
 
 group :development, :test do

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

@@ -72,8 +72,14 @@ def down!
     end
 
     def restart!
-      logger.warn "RESTART: #{owner}, #{driver}"
-      driver.close if driver
+      logger.warn "RESTART: #{owner}"
+      begin
+        connection.close
+      rescue Async::Wrapper::Cancelled
+        # ignore, from connection.close
+      end
+      driver.close
+      driver.emit(:close, WebSocket::Driver::CloseEvent.new(1001, 'bot offline'))
     rescue StandardError => e
       logger.warn "Error restarting team #{owner.id}: #{e.message}."
     end
@@ -102,6 +108,10 @@ def driver
       socket.instance_variable_get(:@driver) if socket
     end
 
+    def connection
+      driver.instance_variable_get(:@socket) if driver
+    end
+
     def logger
       @logger ||= begin
         STDOUT.sync = true

sample_apps/sample_app_activerecord/Gemfile

@@ -7,7 +7,6 @@ gem 'pg'
 gem 'rack-server-pages'
 gem 'rack-test'
 gem 'slack-ruby-bot-server', path: '../../'
-gem 'slack-ruby-client', github: 'dblock/slack-ruby-client', branch: 'async'
 
 group :development, :test do
   gem 'standalone_migrations', '~> 5.2'

sample_apps/sample_app_mongoid/Gemfile

@@ -3,7 +3,6 @@ source 'https://rubygems.org'
 gem 'mongoid'
 gem 'newrelic-slack-ruby-bot'
 gem 'slack-ruby-bot-server', path: '../../'
-gem 'slack-ruby-client', github: 'dblock/slack-ruby-client', branch: 'async'
 
 gem 'kaminari-mongoid'
 gem 'mongoid-scroll'