Skip to content
This repository was archived by the owner on Sep 29, 2025. It is now read-only.

Commit 9ddae0a

Browse files
committed
Use service class instance logger.
1 parent d814a63 commit 9ddae0a

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ def self.start_server!(team, server, wait = 1)
2424
SlackRubyBotServer::Config.service_class.instance.send(:run_callbacks, :error, team, e)
2525
case e.message
2626
when 'account_inactive', 'invalid_auth' then
27-
SlackRubyBotServer::Config.logger.error "#{team.name}: #{e.message}, team will be deactivated."
28-
SlackRubyBotServer::RealTime::Service.instance.deactivate! team
29-
elsef
27+
SlackRubyBotServer::Config.service_class.instance.logger.error "#{team.name}: #{e.message}, team will be deactivated."
28+
SlackRubyBotServer::Config.service_class.instance.deactivate! team
29+
else
3030
wait = e.retry_after if e.is_a?(Slack::Web::Api::Errors::TooManyRequestsError)
31-
SlackRubyBotServer::Config.logger.error "#{team.name}: #{e.message}, restarting in #{wait} second(s)."
31+
SlackRubyBotServer::Config.service_class.instance.logger.error "#{team.name}: #{e.message}, restarting in #{wait} second(s)."
3232
sleep(wait)
3333
start_server! team, server, [wait * 2, 60].min
3434
end
@@ -37,8 +37,8 @@ def self.start_server!(team, server, wait = 1)
3737
def restart!(_wait = 1)
3838
# when an integration is disabled, a live socket is closed, which causes the default behavior of the client to restart
3939
# it would keep retrying without checking for account_inactive or such, we want to restart via service which will disable an inactive team
40-
logger.info "#{team.name}: socket closed, restarting ..."
41-
SlackRubyBotServer::RealTime::Service.instance.restart! team
40+
SlackRubyBotServer::Config.service_class.instance.logger.info "#{team.name}: socket closed, restarting ..."
41+
SlackRubyBotServer::Config.service_class.instance.restart! team
4242
open!
4343
end
4444

spec/slack-ruby-bot-server-rtm/server_spec.rb

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,10 @@
2424
expect(subject.send(:client).names).to include 'foo'
2525
end
2626
end
27+
context 'start_server!' do
28+
pending 'starts server'
29+
pending 'handles account_inactive'
30+
pending 'handles invalid_auth'
31+
pending 'handles generic error'
32+
end
2733
end

0 commit comments

Comments
 (0)