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/componentxmpp.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/componentxmpp.py')
| -rw-r--r-- | sleekxmpp/componentxmpp.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sleekxmpp/componentxmpp.py b/sleekxmpp/componentxmpp.py index ec3d1a04..0963c502 100644 --- a/sleekxmpp/componentxmpp.py +++ b/sleekxmpp/componentxmpp.py @@ -15,13 +15,16 @@ import hashlib from sleekxmpp import plugins from sleekxmpp import stanza -from sleekxmpp.basexmpp import BaseXMPP, SRV_SUPPORT +from sleekxmpp.basexmpp import BaseXMPP from sleekxmpp.xmlstream import XMLStream, RestartStream from sleekxmpp.xmlstream import StanzaBase, ET from sleekxmpp.xmlstream.matcher import * from sleekxmpp.xmlstream.handler import * +log = logging.getLogger(__name__) + + class ComponentXMPP(BaseXMPP): """ @@ -82,7 +85,7 @@ class ComponentXMPP(BaseXMPP): Overrides XMLStream.connect. """ - logging.debug("Connecting to %s:%s" % (self.server_host, + log.debug("Connecting to %s:%s" % (self.server_host, self.server_port)) return XMLStream.connect(self, self.server_host, self.server_port) |