changeset 3614:42363c0d9fc4

merged main
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sun, 18 May 2008 12:25:25 +0200
parents 2232946adeb3 (current diff) 6f06c7d051a4 (diff)
children 3ec104f63144
files
diffstat 4 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/jabberbot/bot.py	Sun May 18 12:24:06 2008 +0200
+++ b/jabberbot/bot.py	Sun May 18 12:25:25 2008 +0200
@@ -50,7 +50,7 @@
 
         raise SystemExit
 
-    log = logging.getLogger("log")
+    log = logging.getLogger(__name__)
     log.setLevel(logging.DEBUG)
     log.addHandler(logging.StreamHandler())
 
--- a/jabberbot/i18n.py	Sun May 18 12:24:06 2008 +0200
+++ b/jabberbot/i18n.py	Sun May 18 12:25:25 2008 +0200
@@ -47,7 +47,7 @@
     """
 
     wiki = xmlrpclib.Server(config.wiki_url + "?action=xmlrpc2")
-    log = logging.getLogger("log")
+    log = logging.getLogger(__name__)
     log.debug("Initialising i18n...")
 
     try:
--- a/jabberbot/xmlrpcbot.py	Sun May 18 12:24:06 2008 +0200
+++ b/jabberbot/xmlrpcbot.py	Sun May 18 12:25:25 2008 +0200
@@ -81,7 +81,7 @@
 
         """
         Thread.__init__(self)
-        self.log = logging.getLogger("log")
+        self.log = logging.getLogger(__name__)
 
         if not config.secret:
             error = "You must set a (long) secret string!"
@@ -310,7 +310,7 @@
         Thread.__init__(self)
         self.commands = commands
         self.verbose = config.verbose
-        self.log = logging.getLogger("log")
+        self.log = logging.getLogger(__name__)
         self.config = config
 
         if config.secret:
--- a/jabberbot/xmppbot.py	Sun May 18 12:24:06 2008 +0200
+++ b/jabberbot/xmppbot.py	Sun May 18 12:25:25 2008 +0200
@@ -180,7 +180,7 @@
         jid = u"%s@%s/%s" % (config.xmpp_node, config.xmpp_server, config.xmpp_resource)
 
         self.config = config
-        self.log = logging.getLogger("log")
+        self.log = logging.getLogger(__name__)
         self.jid = JID(node_or_jid=jid, domain=config.xmpp_server, resource=config.xmpp_resource)
         self.tlsconfig = TLSSettings(require = True, verify_peer=False)