Skip to content

Fix bot connections (for Slack) #22

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

Open
mstratford wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix bot connections (for Slack) #22

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f30f56e
Hopefully fix Slack connection, copied from...
mstratford Jan 31, 2019
bc2afee
Whitespace fixes
mstratford Jan 31, 2019
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
66 changes: 39 additions & 27 deletions encodesrv/logs/bots/slack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,33 @@
from ...config import Config
from ..messages import Message_enum

import websocket._exceptions

logger = logging.getLogger(__name__)

class Slack_rtm_thread(threading.Thread):

def __init__(self, parent, api_key, send_queue):

super(Slack_rtm_thread, self).__init__(daemon = True)
self.api_key = api_key
self.send_queue = send_queue
self.channel = None
self.parent = parent
self.connected = False

def get_connected(self):

return self.connected

def get_channel(self):

return self.channel

def set_channel(self, channel):

self.channel = channel

def run(self):
self.slackclient = slackclient.SlackClient(self.api_key)
connect = self.slackclient.rtm_connect()
Expand All @@ -49,7 +51,17 @@ def run(self):
msg = self.send_queue.get(block = False)
self.slackclient.rtm_send_message(self.get_channel(), Config["servername"] + "> " + msg)
except queue.Empty:
responses = self.slackclient.rtm_read()
try:
responses = self.slackclient.rtm_read()
except (ConnectionResetError, websocket._exceptions.WebSocketConnectionClosedException):
connect = self.slackclient.rtm_connect()
retries = 0
while not connect:
if retries > 8:
retries = 8
connect = self.slackclient.rtm_connect()
time.sleep(retries*15)
retries += 1
if responses == []:
continue
for msg in responses:
Expand All @@ -62,9 +74,9 @@ def run(self):
time.sleep(0.1)
else:
raise Exception("Could not connect to Slack.")

def _slack_respond(self, msg):

matches = common.privmsg_re.findall(msg['text'])
if len(matches) != 1:
return
Expand All @@ -73,23 +85,23 @@ def _slack_respond(self, msg):
daemon = self.parent.parent
enum = Message_enum
form_msg = common.form_msg

if cmd == "status":
msg = form_msg(enum.status, daemon)
else:
msg = form_msg(enum.unknown_cmd, daemon)

self.send_queue.put(msg)

def __str__(self):

return str(self.slackclient)


class Encode_slack():

def __init__(self, parent, api_key = None, channel = None, **kwargs):

assert type(api_key) == str
self.send_queue = queue.Queue()
self.rtm_thread = Slack_rtm_thread(self, api_key, self.send_queue)
Expand All @@ -100,19 +112,19 @@ def __init__(self, parent, api_key = None, channel = None, **kwargs):
while not self.rtm_thread.get_connected():
time.sleep(0.1)
logger.info("Connected to Slack.")

def get_channel(self):

return self.rtm_thread.get_channel()

def set_channel(self, channel):

self.rtm_thread.set_channel(channel)

def send_msg(self, msg):

self.send_queue.put(msg)

def emit(self, record):

self.send_msg(record.getMessage())
self.send_msg(record.getMessage())