Skip to content

update RTM rate limiting comment and error message #308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Roach merged 1 commit into from
Mar 27, 2018
Merged

update RTM rate limiting comment and error message #308

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions slackclient/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ def rtm_connect(self, reconnect=False, timeout=None, use_rtm_start=True, **kwarg
if recon_count == 5:
logging.error("RTM connection failed, reached max reconnects.")
raise SlackConnectionError("RTM connection failed, reached max reconnects.")
# Wait to reconnect if the last reconnect was more than 3 minutes ago
# Wait to reconnect if the last reconnect was less than 3 minutes ago
if (time.time() - self.last_connected_at) < 180:
if recon_count > 0:
# Back off after the the first attempt
Expand All @@ -138,7 +138,7 @@ def rtm_connect(self, reconnect=False, timeout=None, use_rtm_start=True, **kwarg
time.sleep(retry_after)
self.rtm_connect(reconnect=reconnect, timeout=timeout)
else:
raise SlackConnectionError("RTM connection attempt was rate limited 10 times.")
raise SlackConnectionError("RTM connection attempt was rate limited 5 times.")
else:
self.rtm_connect_retries = 0
login_data = reply.json()
Expand Down