jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'tom/hacks'

Browse Source
This commit is contained in:
Brian Beggs 2010-07-01 10:01:52 -04:00
commit f477ccf533
3 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sleekxmpp/basexmpp.py
View File

@ -109,9 +109,9 @@ class basexmpp(object):
if hasattr(self.plugin[plugin], 'xep'): if hasattr(self.plugin[plugin], 'xep'):
xep = "(XEP-%s) " % self.plugin[plugin].xep xep = "(XEP-%s) " % self.plugin[plugin].xep
logging.debug("Loaded Plugin %s%s" % (xep, self.plugin[plugin].description)) logging.debug("Loaded Plugin %s%s" % (xep, self.plugin[plugin].description))
except Exception, e: except:
logging.error("Unable to load plugin: %s" %(plugin) ) logging.exception("Unable to load plugin: %s", plugin )
logging.exception(e)
def register_plugins(self): def register_plugins(self):
"""Initiates all plugins in the plugins/__init__.__all__""" """Initiates all plugins in the plugins/__init__.__all__"""

1
sleekxmpp/xmlstream/scheduler.py
View File

@ -41,6 +41,7 @@ class Scheduler(object):
def process(self, threaded=True): def process(self, threaded=True):
if threaded: if threaded:
self.thread = threading.Thread(name='shedulerprocess', target=self._process) self.thread = threading.Thread(name='shedulerprocess', target=self._process)
self.thread.daemon = True
self.thread.start() self.thread.start()
else: else:
self._process() self._process()

5
sleekxmpp/xmlstream/xmlstream.py
View File

@ -306,11 +306,12 @@ class XMLStream(object):
return True return True
def disconnect(self, reconnect=False): def disconnect(self, reconnect=False):
if not self.state.transition('connected','disconnected'): with self.state.transition_ctx('connected','disconnected') as locked:
if not locked:
logging.warning("Already disconnected.") logging.warning("Already disconnected.")
return return
logging.debug("Disconnecting...") logging.debug("Disconnecting...")
self.sendPriorityRaw(self.stream_footer) self.sendRaw(self.stream_footer)
time.sleep(5) time.sleep(5)
#send end of stream #send end of stream
#wait for end of stream back #wait for end of stream back