diff options
author | Lance Stout <lancestout@gmail.com> | 2010-11-17 02:00:20 -0500 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2010-11-17 02:01:12 -0500 |
commit | 26aca2b789f62123819041229ba40ab10268f49e (patch) | |
tree | 20388fb0559ed85f7143eb3b8a669142cdc43f6b /sleekxmpp/plugins/xep_0012.py | |
parent | 4f69a03bb1a8caab7899bd04f97b7975a78f2f34 (diff) | |
parent | 5424ede413393db5b835686e8544a9b703fb113b (diff) | |
download | slixmpp-26aca2b789f62123819041229ba40ab10268f49e.tar.gz slixmpp-26aca2b789f62123819041229ba40ab10268f49e.tar.bz2 slixmpp-26aca2b789f62123819041229ba40ab10268f49e.tar.xz slixmpp-26aca2b789f62123819041229ba40ab10268f49e.zip |
Merge branch 'roster' of github.com:fritzy/SleekXMPP into roster
Conflicts:
sleekxmpp/basexmpp.py
sleekxmpp/roster.py
sleekxmpp/test/sleektest.py
tests/test_stream_presence.py
tests/test_stream_roster.py
Diffstat (limited to 'sleekxmpp/plugins/xep_0012.py')
-rw-r--r-- | sleekxmpp/plugins/xep_0012.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sleekxmpp/plugins/xep_0012.py b/sleekxmpp/plugins/xep_0012.py index 45ca8a00..d636d4d7 100644 --- a/sleekxmpp/plugins/xep_0012.py +++ b/sleekxmpp/plugins/xep_0012.py @@ -16,6 +16,9 @@ from .. xmlstream.matcher.xpath import MatchXPath from .. xmlstream import ElementBase, ET, JID, register_stanza_plugin
+log = logging.getLogger(__name__)
+
+
class LastActivity(ElementBase):
name = 'query'
namespace = 'jabber:iq:last'
@@ -68,10 +71,10 @@ class xep_0012(base.base_plugin): def handle_last_activity_query(self, iq):
if iq['type'] == 'get':
- logging.debug("Last activity requested by %s" % iq['from'])
+ log.debug("Last activity requested by %s" % iq['from'])
self.xmpp.event('last_activity_request', iq)
elif iq['type'] == 'result':
- logging.debug("Last activity result from %s" % iq['from'])
+ log.debug("Last activity result from %s" % iq['from'])
self.xmpp.event('last_activity', iq)
def handle_last_activity(self, iq):
|