summaryrefslogtreecommitdiff
path: root/sleekxmpp/features
diff options
context:
space:
mode:
authorVijay Pandurangan <vijayp@vijayp.ca>2011-11-20 03:30:44 +0800
committerLance Stout <lancestout@gmail.com>2011-11-20 03:39:05 +0800
commitdeb52ad3502a94f91ef5400bf5b7605b8e151f50 (patch)
tree879d9e076ed037bf5056514a8e470e7d471f26ca /sleekxmpp/features
parent1baf139ca4be0c05a6a845becf18412b213a3c02 (diff)
downloadslixmpp-deb52ad3502a94f91ef5400bf5b7605b8e151f50.tar.gz
slixmpp-deb52ad3502a94f91ef5400bf5b7605b8e151f50.tar.bz2
slixmpp-deb52ad3502a94f91ef5400bf5b7605b8e151f50.tar.xz
slixmpp-deb52ad3502a94f91ef5400bf5b7605b8e151f50.zip
This change stops sleekxmpp from spending huge amounts of time unnecessarily computing logging data that may never be used. This is a HUGE performance improvement; in some of my test runs, unnecessary string creation was accounting for > 60% of all CPU time.
Note that using % in a string will _always_ perform the sting substitutions, because the strings are constructed before the function is called. So log.debug('%s' % expensiveoperation()) will take about the same CPU time whether or not the logging level is DEBUG or INFO. if you use , no substitutions are performed unless the string is actually logged
Diffstat (limited to 'sleekxmpp/features')
-rw-r--r--sleekxmpp/features/feature_bind/bind.py4
-rw-r--r--sleekxmpp/features/feature_mechanisms/mechanisms.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/sleekxmpp/features/feature_bind/bind.py b/sleekxmpp/features/feature_bind/bind.py
index de03192c..ac3f4476 100644
--- a/sleekxmpp/features/feature_bind/bind.py
+++ b/sleekxmpp/features/feature_bind/bind.py
@@ -42,7 +42,7 @@ class feature_bind(base_plugin):
Arguments:
features -- The stream features stanza.
"""
- log.debug("Requesting resource: %s" % self.xmpp.boundjid.resource)
+ log.debug("Requesting resource: %s" , self.xmpp.boundjid.resource)
iq = self.xmpp.Iq()
iq['type'] = 'set'
iq.enable('bind')
@@ -55,7 +55,7 @@ class feature_bind(base_plugin):
self.xmpp.features.add('bind')
- log.info("Node set to: %s" % self.xmpp.boundjid.full)
+ log.info("Node set to: %s" , self.xmpp.boundjid.full)
if 'session' not in features['features']:
log.debug("Established Session")
diff --git a/sleekxmpp/features/feature_mechanisms/mechanisms.py b/sleekxmpp/features/feature_mechanisms/mechanisms.py
index a6cff0a0..5e5f0cd1 100644
--- a/sleekxmpp/features/feature_mechanisms/mechanisms.py
+++ b/sleekxmpp/features/feature_mechanisms/mechanisms.py
@@ -123,7 +123,7 @@ class feature_mechanisms(base_plugin):
def _handle_fail(self, stanza):
"""SASL authentication failed. Disconnect and shutdown."""
- log.info("Authentication failed: %s" % stanza['condition'])
+ log.info("Authentication failed: %s" , stanza['condition'])
self.xmpp.event("failed_auth", stanza, direct=True)
self.xmpp.disconnect()
return True