aboutsummaryrefslogtreecommitdiffstats
path: root/sleekxmpp/xmlstream/scheduler.py
diff options
context:
space:
mode:
authorGuillaume Horel <guillaume.horel@gmail.com>2010-11-23 22:52:48 -0500
committerGuillaume Horel <guillaume.horel@gmail.com>2010-11-23 22:52:48 -0500
commit217835b3adddedc9e8c501e8868d0440509ba1d5 (patch)
tree87ca06cceaf5af8a6d18fb57b65143cb784fb123 /sleekxmpp/xmlstream/scheduler.py
parenta5b4d8b2d4cda356afddcdab4864d27e165237f7 (diff)
downloadalias-217835b3adddedc9e8c501e8868d0440509ba1d5.tar.gz
Update to latest version of sleekxmpp
this fixes the bug with service discovery
Diffstat (limited to 'sleekxmpp/xmlstream/scheduler.py')
-rw-r--r--sleekxmpp/xmlstream/scheduler.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/sleekxmpp/xmlstream/scheduler.py b/sleekxmpp/xmlstream/scheduler.py
index 240d4a4..1435910 100644
--- a/sleekxmpp/xmlstream/scheduler.py
+++ b/sleekxmpp/xmlstream/scheduler.py
@@ -15,6 +15,9 @@ except ImportError:
import Queue as queue
+log = logging.getLogger(__name__)
+
+
class Task(object):
"""
@@ -146,6 +149,8 @@ class Scheduler(object):
if wait <= 0.0:
newtask = self.addq.get(False)
else:
+ if wait >= 3.0:
+ wait = 3.0
newtask = self.addq.get(True, wait)
except queue.Empty:
cleanup = []
@@ -168,13 +173,13 @@ class Scheduler(object):
except KeyboardInterrupt:
self.run = False
if self.parentstop is not None:
- logging.debug("stopping parent")
+ log.debug("stopping parent")
self.parentstop.set()
except SystemExit:
self.run = False
if self.parentstop is not None:
self.parentstop.set()
- logging.debug("Quitting Scheduler thread")
+ log.debug("Quitting Scheduler thread")
if self.parentqueue is not None:
self.parentqueue.put(('quit', None, None))