diff options
| author | Nathan Fritz <nathan@andyet.net> | 2010-07-26 18:13:54 -0700 |
|---|---|---|
| committer | Nathan Fritz <nathan@andyet.net> | 2010-07-26 18:13:54 -0700 |
| commit | 2b6454786ace5f9cc585fd30f1337809f2107bf8 (patch) | |
| tree | 585768e41d2f59463c9f79592370a4c60f8a134a /sleekxmpp/xmlstream | |
| parent | a349a2a317a6ca7152e0adb21d5fabbfd632ebaf (diff) | |
| parent | c8989c04f3675235e3ae730cb240e2154b5d9e76 (diff) | |
| download | slixmpp-2b6454786ace5f9cc585fd30f1337809f2107bf8.tar.gz slixmpp-2b6454786ace5f9cc585fd30f1337809f2107bf8.tar.bz2 slixmpp-2b6454786ace5f9cc585fd30f1337809f2107bf8.tar.xz slixmpp-2b6454786ace5f9cc585fd30f1337809f2107bf8.zip | |
Merge branch 'experimental' of git@github.com:fritzy/SleekXMPP into experimental
Diffstat (limited to 'sleekxmpp/xmlstream')
| -rw-r--r-- | sleekxmpp/xmlstream/stanzabase.py | 3 | ||||
| -rw-r--r-- | sleekxmpp/xmlstream/xmlstream.py | 12 |
2 files changed, 6 insertions, 9 deletions
diff --git a/sleekxmpp/xmlstream/stanzabase.py b/sleekxmpp/xmlstream/stanzabase.py index 8af90a0f..b8c80ffa 100644 --- a/sleekxmpp/xmlstream/stanzabase.py +++ b/sleekxmpp/xmlstream/stanzabase.py @@ -7,7 +7,6 @@ """ from xml.etree import cElementTree as ET import logging -import traceback import sys import weakref import copy @@ -379,7 +378,7 @@ class StanzaBase(ElementBase): pass def exception(self, e): - logging.error(traceback.format_tb(e)) + logging.exception('Error handling {%s}%s stanza' % (self.namespace, self.name)) def send(self): self.stream.sendRaw(self.__str__()) diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py index cea204b9..6ce89c25 100644 --- a/sleekxmpp/xmlstream/xmlstream.py +++ b/sleekxmpp/xmlstream/xmlstream.py @@ -19,7 +19,6 @@ import logging import socket import threading import time -import traceback import types import copy import xml.sax.saxutils @@ -195,14 +194,14 @@ class XMLStream(object): return else: self.state.set('processing', False) - traceback.print_exc() + logging.exception('Socket Error') self.disconnect(reconnect=True) except: if not self.state.reconnect: return else: self.state.set('processing', False) - traceback.print_exc() + logging.exception('Connection error. Reconnecting.') self.disconnect(reconnect=True) if self.state['reconnect']: self.reconnect() @@ -258,8 +257,7 @@ class XMLStream(object): logging.warning("Failed to send %s" % data) self.state.set('connected', False) if self.state.reconnect: - logging.error("Disconnected. Socket Error.") - traceback.print_exc() + logging.exception("Disconnected. Socket Error.") self.disconnect(reconnect=True) def sendRaw(self, data): @@ -344,14 +342,14 @@ class XMLStream(object): try: handler.run(args[0]) except Exception as e: - traceback.print_exc() + logging.exception('Error processing event handler: %s' % handler.name) args[0].exception(e) elif etype == 'schedule': try: logging.debug(args) handler(*args[0]) except: - logging.error(traceback.format_exc()) + logging.exception('Error processing scheduled task') elif etype == 'quit': logging.debug("Quitting eventRunner thread") return False |