Commit 563e3b44 authored by Patrick Gerken's avatar Patrick Gerken

Merge pull request #7 from do3cc/master

Add server side logging for MTDelay
parents 5e1e4052 71b219a1
Changelog Changelog
========= =========
4.0.1dev (unreleased)
---------------------
- Log errors on server side even if using multi threaded delay.
4.0.0 (2013-08-18) 4.0.0 (2013-08-18)
------------------ ------------------
......
...@@ -52,7 +52,7 @@ class Delay: ...@@ -52,7 +52,7 @@ class Delay:
def error(self, exc_info): def error(self, exc_info):
self.sent = 'error' self.sent = 'error'
log("Error raised in delayed method", logging.ERROR, exc_info=True) log("Error raised in delayed method", logging.ERROR, exc_info=exc_info)
self.conn.return_error(self.msgid, *exc_info[:2]) self.conn.return_error(self.msgid, *exc_info[:2])
def __repr__(self): def __repr__(self):
...@@ -84,6 +84,7 @@ class MTDelay(Delay): ...@@ -84,6 +84,7 @@ class MTDelay(Delay):
def error(self, exc_info): def error(self, exc_info):
self.ready.wait() self.ready.wait()
log("Error raised in delayed method", logging.ERROR, exc_info=exc_info)
self.conn.call_from_thread(Delay.error, self, exc_info) self.conn.call_from_thread(Delay.error, self, exc_info)
# PROTOCOL NEGOTIATION # PROTOCOL NEGOTIATION
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment