github/SleekXMPP
1
0
Fork 0
mirror of https://github.com/correl/SleekXMPP.git synced 2025-02-25 03:00:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Tidy up logging calls.

Browse source
This commit is contained in:
Lance Stout 2011-11-19 12:07:57 -08:00
parent deb52ad350
commit 429c94d6a9
23 changed files with 80 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sleekxmpp/basexmpp.py
View file

@ -282,7 +282,7 @@ class BaseXMPP(XMLStream):
if key in self.plugin: if key in self.plugin:
return self.plugin[key] return self.plugin[key]
else: else:
log.warning("""Plugin "%s" is not loaded.""" , key) log.warning("Plugin '%s' is not loaded.", key)
return False return False
def get(self, key, default): def get(self, key, default):
@ -790,8 +790,8 @@ class BaseXMPP(XMLStream):
""" """
if isinstance(exception, IqError): if isinstance(exception, IqError):
iq = exception.iq iq = exception.iq
log.error('%s: %s' % (iq['error']['condition'], log.error('%s: %s', iq['error']['condition'],
iq['error']['text'])) iq['error']['text'])
log.warning('You should catch IqError exceptions') log.warning('You should catch IqError exceptions')
elif isinstance(exception, IqTimeout): elif isinstance(exception, IqTimeout):
iq = exception.iq iq = exception.iq

2
sleekxmpp/clientxmpp.py
View file

@ -168,7 +168,7 @@ class ClientXMPP(BaseXMPP):
answers = super(ClientXMPP, self).get_dns_records(domain, port) answers = super(ClientXMPP, self).get_dns_records(domain, port)
except dns.exception.Timeout: except dns.exception.Timeout:
log.warning("DNS resolution timed out " + \ log.warning("DNS resolution timed out " + \
"for SRV record of %s" % domain) "for SRV record of %s", domain)
answers = super(ClientXMPP, self).get_dns_records(domain, port) answers = super(ClientXMPP, self).get_dns_records(domain, port)
return answers return answers
else: else:

4
sleekxmpp/componentxmpp.py
View file

@ -87,8 +87,8 @@ class ComponentXMPP(BaseXMPP):
Overrides XMLStream.connect. Overrides XMLStream.connect.
""" """
log.debug("Connecting to %s:%s" % (self.server_host, log.debug("Connecting to %s:%s", self.server_host,
self.server_port)) self.server_port)
return XMLStream.connect(self, self.server_host, return XMLStream.connect(self, self.server_host,
self.server_port) self.server_port)

10
sleekxmpp/plugins/xep_0030/disco.py
View file

@ -268,7 +268,7 @@ class xep_0030(base_plugin):
""" """
if local or jid is None: if local or jid is None:
log.debug("Looking up local disco#info data " + \ log.debug("Looking up local disco#info data " + \
"for %s, node %s." % (jid, node)) "for %s, node %s.", jid, node)
info = self._run_node_handler('get_info', jid, node, kwargs) info = self._run_node_handler('get_info', jid, node, kwargs)
return self._fix_default_info(info) return self._fix_default_info(info)
@ -542,7 +542,7 @@ class xep_0030(base_plugin):
""" """
if iq['type'] == 'get': if iq['type'] == 'get':
log.debug("Received disco info query from " + \ log.debug("Received disco info query from " + \
"<%s> to <%s>." % (iq['from'], iq['to'])) "<%s> to <%s>.", iq['from'], iq['to'])
if self.xmpp.is_component: if self.xmpp.is_component:
jid = iq['to'].full jid = iq['to'].full
else: else:
@ -558,7 +558,7 @@ class xep_0030(base_plugin):
iq.send() iq.send()
elif iq['type'] == 'result': elif iq['type'] == 'result':
log.debug("Received disco info result from" + \ log.debug("Received disco info result from" + \
"%s to %s." % (iq['from'], iq['to'])) "%s to %s.", iq['from'], iq['to'])
self.xmpp.event('disco_info', iq) self.xmpp.event('disco_info', iq)
def _handle_disco_items(self, iq): def _handle_disco_items(self, iq):
@ -572,7 +572,7 @@ class xep_0030(base_plugin):
""" """
if iq['type'] == 'get': if iq['type'] == 'get':
log.debug("Received disco items query from " + \ log.debug("Received disco items query from " + \
"<%s> to <%s>." % (iq['from'], iq['to'])) "<%s> to <%s>.", iq['from'], iq['to'])
if self.xmpp.is_component: if self.xmpp.is_component:
jid = iq['to'].full jid = iq['to'].full
else: else:
@ -586,7 +586,7 @@ class xep_0030(base_plugin):
iq.send() iq.send()
elif iq['type'] == 'result': elif iq['type'] == 'result':
log.debug("Received disco items result from" + \ log.debug("Received disco items result from" + \
"%s to %s." % (iq['from'], iq['to'])) "%s to %s.", iq['from'], iq['to'])
self.xmpp.event('disco_items', iq) self.xmpp.event('disco_items', iq)
def _fix_default_info(self, info): def _fix_default_info(self, info):

4
sleekxmpp/xmlstream/stanzabase.py
View file

@ -1261,8 +1261,8 @@ class StanzaBase(ElementBase):
Meant to be overridden. Meant to be overridden.
""" """
log.exception('Error handling {%s}%s stanza' % (self.namespace, log.exception('Error handling {%s}%s stanza', self.namespace,
self.name)) self.name)
def send(self, now=False): def send(self, now=False):
""" """

15
sleekxmpp/xmlstream/xmlstream.py
View file

@ -402,8 +402,8 @@ class XMLStream(object):
except Socket.error as serr: except Socket.error as serr:
error_msg = "Could not connect to %s:%s. Socket Error #%s: %s" error_msg = "Could not connect to %s:%s. Socket Error #%s: %s"
self.event('socket_error', serr) self.event('socket_error', serr)
log.error(error_msg % (self.address[0], self.address[1], log.error(error_msg, self.address[0], self.address[1],
serr.errno, serr.strerror)) serr.errno, serr.strerror)
self.reconnect_delay = delay self.reconnect_delay = delay
return False return False
@ -455,8 +455,8 @@ class XMLStream(object):
except Socket.error as serr: except Socket.error as serr:
error_msg = "Could not connect to %s:%s. Socket Error #%s: %s" error_msg = "Could not connect to %s:%s. Socket Error #%s: %s"
self.event('socket_error', serr) self.event('socket_error', serr)
log.error(error_msg % (self.address[0], self.address[1], log.error(error_msg, self.address[0], self.address[1],
serr.errno, serr.strerror)) serr.errno, serr.strerror)
return False return False
def _handle_connected(self, event=None): def _handle_connected(self, event=None):
@ -468,7 +468,7 @@ class XMLStream(object):
def _handle_session_timeout(): def _handle_session_timeout():
if not self.session_started_event.isSet(): if not self.session_started_event.isSet():
log.debug("Session start has taken more " + \ log.debug("Session start has taken more " + \
"than %d seconds" % self.session_timeout) "than %d seconds", self.session_timeout)
self.disconnect(reconnect=self.auto_reconnect) self.disconnect(reconnect=self.auto_reconnect)
self.schedule("Session timeout check", self.schedule("Session timeout check",
@ -763,7 +763,7 @@ class XMLStream(object):
return [((domain, port), 0, 0)] return [((domain, port), 0, 0)]
except dns.exception.Timeout: except dns.exception.Timeout:
log.warning("DNS resolution timed out " + \ log.warning("DNS resolution timed out " + \
"for A record of %s" % domain) "for A record of %s", domain)
return [((domain, port), 0, 0)] return [((domain, port), 0, 0)]
else: else:
return [((ans.address, port), 0, 0) for ans in answers] return [((ans.address, port), 0, 0) for ans in answers]
@ -1187,8 +1187,7 @@ class XMLStream(object):
Arguments: Arguments:
xml -- The XML stanza to analyze. xml -- The XML stanza to analyze.
""" """
log.debug("RECV: %s" , tostring(xml, log.debug("RECV: %s", tostring(xml, xmlns=self.default_ns,
xmlns=self.default_ns,
stream=self)) stream=self))
# Apply any preprocessing filters. # Apply any preprocessing filters.
xml = self.incoming_filter(xml) xml = self.incoming_filter(xml)