nemunaire/nemubot
1
0
Fork 0
Code Releases Activity

Review consumer errors

Browse Source
This commit is contained in:
nemunaire 2016-03-06 21:43:08 +01:00
parent 95fc044783
commit 4473d9547e
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nemubot/consumer.py
View File

@ -44,7 +44,7 @@ class MessageConsumer:
msgs.append(msg) msgs.append(msg)
except: except:
logger.exception("Error occurred during the processing of the %s: " logger.exception("Error occurred during the processing of the %s: "
"%s", type(self.msgs[0]).__name__, self.msgs[0]) "%s", type(self.orig).__name__, self.orig)
if len(msgs) <= 0: if len(msgs) <= 0:
return return
@ -55,6 +55,8 @@ class MessageConsumer:
if hasattr(msg, "frm_owner"): if hasattr(msg, "frm_owner"):
msg.frm_owner = (not hasattr(self.srv, "owner") or self.srv.owner == msg.frm) msg.frm_owner = (not hasattr(self.srv, "owner") or self.srv.owner == msg.frm)
from nemubot.server.abstract import AbstractServer
# Treat the message # Treat the message
for msg in msgs: for msg in msgs:
for res in context.treater.treat_msg(msg): for res in context.treater.treat_msg(msg):
@ -62,15 +64,19 @@ class MessageConsumer:
to_server = None to_server = None
if isinstance(res, str): if isinstance(res, str):
to_server = self.srv to_server = self.srv
elif not hasattr(res, "server"):
logger.error("No server defined for response of type %s: %s", type(res).__name__, res)
continue
elif res.server is None: elif res.server is None:
to_server = self.srv to_server = self.srv
res.server = self.srv.id res.server = self.srv.id
elif isinstance(res.server, str) and res.server in context.servers: elif isinstance(res.server, str) and res.server in context.servers:
to_server = context.servers[res.server] to_server = context.servers[res.server]
else:
to_server = res.server
if to_server is None: if to_server is None or not hasattr(to_server, "send_response") or not callable(to_server.send_response):
logger.error("The server defined in this response doesn't " logger.error("The server defined in this response doesn't exist: %s", res.server)
"exist: %s", res.server)
continue continue
# Sent the message only if treat_post authorize it # Sent the message only if treat_post authorize it