summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream/xmlstream.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2010-11-04 14:35:35 -0400
committerLance Stout <lancestout@gmail.com>2010-11-04 14:35:35 -0400
commit7351fe1a0226298419e3d174d7b156daad91c131 (patch)
tree85c9565bb9fab2d35d19c4a0c87f792dfa854191 /sleekxmpp/xmlstream/xmlstream.py
parent38c2f51f834d8f17ebdcca45ec795fb935f969b5 (diff)
downloadslixmpp-7351fe1a0226298419e3d174d7b156daad91c131.tar.gz
slixmpp-7351fe1a0226298419e3d174d7b156daad91c131.tar.bz2
slixmpp-7351fe1a0226298419e3d174d7b156daad91c131.tar.xz
slixmpp-7351fe1a0226298419e3d174d7b156daad91c131.zip
Fix bug introduced while fixing another bug.
Threaded event handlers now handle exceptions again.
Diffstat (limited to 'sleekxmpp/xmlstream/xmlstream.py')
-rw-r--r--sleekxmpp/xmlstream/xmlstream.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py
index 218b4b5a..a5262814 100644
--- a/sleekxmpp/xmlstream/xmlstream.py
+++ b/sleekxmpp/xmlstream/xmlstream.py
@@ -828,8 +828,11 @@ class XMLStream(object):
"""
try:
func(*args)
- except:
- pass
+ except Exception as e:
+ error_msg = 'Error processing event handler: %s'
+ logging.exception(error_msg % str(func))
+ if hasattr(args[0], 'exception'):
+ args[0].exception(e)
def _event_runner(self):
"""