mirror of
https://github.com/correl/SleekXMPP.git
synced 2024-11-27 19:19:54 +00:00
Replaced traceback calls to use logging.exception where applicable.
This commit is contained in:
parent
241aba8c76
commit
c8989c04f3
4 changed files with 8 additions and 10 deletions
|
@ -9,7 +9,6 @@ from __future__ import with_statement
|
|||
from . import base
|
||||
import logging
|
||||
from xml.etree import cElementTree as ET
|
||||
import traceback
|
||||
import time
|
||||
|
||||
class xep_0050(base.base_plugin):
|
||||
|
|
|
@ -9,6 +9,7 @@ from .. xmlstream.stanzabase import StanzaBase
|
|||
from xml.etree import cElementTree as ET
|
||||
from . error import Error
|
||||
from .. exceptions import XMPPError
|
||||
import logging
|
||||
import traceback
|
||||
import sys
|
||||
|
||||
|
@ -29,6 +30,7 @@ class RootStanza(StanzaBase):
|
|||
self['error']['text'] = "SleekXMPP got into trouble."
|
||||
else:
|
||||
self['error']['text'] = traceback.format_tb(e.__traceback__)
|
||||
logging.exception('Error handling {%s}%s stanza' % (self.namespace, self.name))
|
||||
self.send()
|
||||
|
||||
# all jabber:client root stanzas should have the error plugin
|
||||
|
|
|
@ -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__())
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue