diff options
| -rw-r--r-- | sleekxmpp/xmlstream/xmlstream.py | 14 | ||||
| -rw-r--r-- | testall.py | 2 |
2 files changed, 14 insertions, 2 deletions
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py index 3459f507..41ee8329 100644 --- a/sleekxmpp/xmlstream/xmlstream.py +++ b/sleekxmpp/xmlstream/xmlstream.py @@ -16,6 +16,7 @@ import sys import threading import time import types +import signal try: import queue except ImportError: @@ -195,6 +196,17 @@ class XMLStream(object): self.auto_reconnect = True self.is_client = False + signal.signal(signal.SIGHUP, self._handle_kill) + signal.signal(signal.SIGTERM, self._handle_kill) # used in Windows + + def _handle_kill(self, signum, frame): + """ + Capture kill event and disconnect cleanly after first + spawning the "killed" event. + """ + self.event("killed", direct=True) + self.disconnect() + def new_id(self): """ Generate and return a new stream ID in hexadecimal form. @@ -710,7 +722,7 @@ class XMLStream(object): if depth == 0: # The stream's root element has closed, # terminating the stream. - logging.debug("Ending read XML loop") + logging.debug("End of stream recieved") self.stream_end_event.set() return False elif depth == 1: @@ -13,7 +13,7 @@ class testoverall(unittest.TestCase): if sys.version_info < (3,0): self.failUnless(compileall.compile_dir('.' + os.sep + 'sleekxmpp', rx=re.compile('/[.]svn'), quiet=True)) else: - self.failUnless(compileall.compile_dir('.' + os.sep + 'sleekxmpp', rx=re.compile('/[.]svn|.*26\Z'), quiet=True)) + self.failUnless(compileall.compile_dir('.' + os.sep + 'sleekxmpp', rx=re.compile('/[.]svn|.*26.*'), quiet=True)) def testTabNanny(self): """Invoking the tabnanny""" |