summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream/xmlstream.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-04-29 14:48:14 -0700
committerLance Stout <lancestout@gmail.com>2012-04-29 14:48:14 -0700
commitbf8a9dc20d570d16ff9a0761e504c196cfcebee3 (patch)
treecff9a7bdd1a56b9156d10cd62aa5290814f55842 /sleekxmpp/xmlstream/xmlstream.py
parent08716c35fd3c19921cdc87fdaaec7ddc56e88bb5 (diff)
downloadslixmpp-bf8a9dc20d570d16ff9a0761e504c196cfcebee3.tar.gz
slixmpp-bf8a9dc20d570d16ff9a0761e504c196cfcebee3.tar.bz2
slixmpp-bf8a9dc20d570d16ff9a0761e504c196cfcebee3.tar.xz
slixmpp-bf8a9dc20d570d16ff9a0761e504c196cfcebee3.zip
Add logging note about potential cause of disconnect() deadlock.
Diffstat (limited to 'sleekxmpp/xmlstream/xmlstream.py')
-rw-r--r--sleekxmpp/xmlstream/xmlstream.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py
index 62083de8..34c9773c 100644
--- a/sleekxmpp/xmlstream/xmlstream.py
+++ b/sleekxmpp/xmlstream/xmlstream.py
@@ -1204,7 +1204,9 @@ class XMLStream(object):
self.__thread_count)
self.__thread_cond.wait(4)
if self.__thread_count != 0:
- raise Exception("Hanged threads: %s" % threading.enumerate())
+ log.error("Hanged threads: %s" % threading.enumerate())
+ log.error("This may be due to calling disconnect() " + \
+ "from a non-threaded event handler.")
def process(self, **kwargs):
"""Initialize the XML streams and begin processing events.