diff options
| author | Nathan Fritz <nathan@andyet.net> | 2010-05-29 10:19:28 +0800 |
|---|---|---|
| committer | Thom Nichols <tmnichols@gmail.com> | 2010-06-01 22:07:52 +0800 |
| commit | 257bcadd9614041d5c501d8e513f59de6f88befa (patch) | |
| tree | 15eceb3d4fea9bfe38fc29e3185f4d89d86d575f /sleekxmpp/xmlstream/xmlstream.py | |
| parent | 3e5cdc8664368af45e2728326cf0cbea24b6beb7 (diff) | |
| download | slixmpp-257bcadd9614041d5c501d8e513f59de6f88befa.tar.gz slixmpp-257bcadd9614041d5c501d8e513f59de6f88befa.tar.bz2 slixmpp-257bcadd9614041d5c501d8e513f59de6f88befa.tar.xz slixmpp-257bcadd9614041d5c501d8e513f59de6f88befa.zip | |
control-c fixes
Diffstat (limited to 'sleekxmpp/xmlstream/xmlstream.py')
| -rw-r--r-- | sleekxmpp/xmlstream/xmlstream.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py index 006f3876..cea300a7 100644 --- a/sleekxmpp/xmlstream/xmlstream.py +++ b/sleekxmpp/xmlstream/xmlstream.py @@ -76,7 +76,7 @@ class XMLStream(object): self.eventqueue = queue.Queue() self.sendqueue = queue.Queue() - self.scheduler = scheduler.Scheduler() + self.scheduler = scheduler.Scheduler(self.eventqueue) self.namespace_map = {} @@ -149,6 +149,7 @@ class XMLStream(object): def process(self, threaded=True): self.scheduler.process(threaded=True) for t in range(0, HANDLER_THREADS): + logging.debug("Starting HANDLER THREAD") self.__thread['eventhandle%s' % t] = threading.Thread(name='eventhandle%s' % t, target=self._eventRunner) self.__thread['eventhandle%s' % t].start() self.__thread['sendthread'] = threading.Thread(name='sendthread', target=self._sendThread) @@ -333,6 +334,9 @@ class XMLStream(object): event = self.eventqueue.get(True, timeout=5) except queue.Empty: event = None + except KeyboardInterrupt: + self.run = False + self.scheduler.run = False if event is not None: etype = event[0] handler = event[1] |