From c8989c04f3675235e3ae730cb240e2154b5d9e76 Mon Sep 17 00:00:00 2001
From: Lance Stout <lancestout@gmail.com>
Date: Mon, 26 Jul 2010 21:02:25 -0400
Subject: Replaced traceback calls to use logging.exception where applicable.
---
sleekxmpp/xmlstream/stanzabase.py | 3 +--
sleekxmpp/xmlstream/xmlstream.py | 12 +++++-------
2 files changed, 6 insertions(+), 9 deletions(-)
(limited to 'sleekxmpp/xmlstream')
diff --git a/sleekxmpp/xmlstream/stanzabase.py b/sleekxmpp/xmlstream/stanzabase.py
index 66a08e49..ab054073 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
@@ -400,7 +399,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
--
cgit v1.2.3