From 5bdcd9ef9d74d7921f5579086e6c6d94c0ac7deb Mon Sep 17 00:00:00 2001
From: Lance Stout <lancestout@gmail.com>
Date: Mon, 25 Oct 2010 15:09:56 -0400
Subject: Made exceptions work.

Raising an XMPPError exception from an event handler now works, even if
from a threaded handler.

Added stream tests to verify.

We should start using XMPPError, it really makes things simple!
---
 sleekxmpp/exceptions.py          |  3 +++
 sleekxmpp/xmlstream/xmlstream.py | 31 ++++++++++++++++++++++++++-----
 2 files changed, 29 insertions(+), 5 deletions(-)

(limited to 'sleekxmpp')

diff --git a/sleekxmpp/exceptions.py b/sleekxmpp/exceptions.py
index 980c6b6e..d3988b4a 100644
--- a/sleekxmpp/exceptions.py
+++ b/sleekxmpp/exceptions.py
@@ -38,6 +38,9 @@ class XMPPError(Exception):
                               element. Same as the additional arguments to
                               the ET.Element constructor.
         """
+        if extension_args is None:
+            extension_args = {}
+
         self.condition = condition
         self.text = text
         self.etype = etype
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py
index e11497f2..ace93cc3 100644
--- a/sleekxmpp/xmlstream/xmlstream.py
+++ b/sleekxmpp/xmlstream/xmlstream.py
@@ -786,6 +786,23 @@ class XMLStream(object):
         if unhandled:
             stanza.unhandled()
 
+    def _threaded_event_wrapper(self, func, args):
+        """
+        Capture exceptions for event handlers that run 
+        in individual threads.
+
+        Arguments:
+            func -- The event handler to execute.
+            args -- Arguments to the event handler.
+        """
+        try:
+            func(*args)
+        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):
         """
         Process the event queue and execute handlers.
@@ -825,14 +842,18 @@ class XMLStream(object):
                     func, threaded, disposable = handler
                     try:
                         if threaded:
-                            x = threading.Thread(name="Event_%s" % str(func),
-                                                 target=func,
-                                                 args=args)
+                            x = threading.Thread(
+                                    name="Event_%s" % str(func),
+                                    target=self._threaded_event_wrapper,
+                                    args=(func, args))
                             x.start()
                         else:
                             func(*args)
-                    except:
-                        logging.exception('Error processing event handler: %s')
+                    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)
                 elif etype == 'quit':
                     logging.debug("Quitting event runner thread")
                     return False
-- 
cgit v1.2.3