Re-ordered the logging to use the module namespace to segregate itself

Added a TODO to a hanging comment
waartaa · Apr 18, 2016 · 21ecda7 · 21ecda7
1 parent d773252
commit 21ecda7
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 61 deletions.
diff --git a/ircb/bouncer.py b/ircb/bouncer.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import asyncio
 import logging
 
@@ -12,7 +11,7 @@
 from ircb.storeclient import initialize as storeclient_initialize
 from ircb.storeclient import ChannelStore, ClientStore, NetworkStore, UserStore
 
-logger = logging.getLogger('bouncer')
+logger = logging.getLogger(__name__)
 
 
 class BouncerServerClientProtocol(Connection):

diff --git a/ircb/config/default_settings.py b/ircb/config/default_settings.py
@@ -1,3 +1,5 @@
+import yaml
+
 SECRET_KEY = 'some key'
 
 DB_URI = 'sqlite:///ircb.db'
@@ -6,60 +8,31 @@
     'stores': 'tcp://127.0.0.1:35000',
 }
 
-LOGGING_CONF = dict(
-    version=1,
-    formatters=dict(
-        bare={
-            "datefmt": "%Y-%m-%d %H:%M:%S",
-            "format": "[%(asctime)s][%(name)10s %(levelname)7s] %(message)s"
-        },
-    ),
-    handlers=dict(
-        console={
-            "class": "logging.StreamHandler",
-            "formatter": "bare",
-            "level": "DEBUG",
-            "stream": "ext://sys.stdout",
-        }
-    ),
-    loggers=dict(
-        ircb={
-            "level": "DEBUG",
-            "propagate": False,
-            "handlers": ["console"],
-        },
-        network={
-            "level": "DEBUG",
-            "propagate": False,
-            "handlers": ["console"],
-        },
-        bouncer={
-            "level": "DEBUG",
-            "propagate": False,
-            "handlers": ["console"],
-        },
-        stores={
-            "level": "DEBUG",
-            "propagate": False,
-            "handlers": ["console"],
-        },
-        dispatcher={
-            "level": "DEBUG",
-            "propagate": False,
-            "handlers": ["console"],
-        },
-        irc={
-            "level": "DEBUG",
-            "propagate": False,
-            "handlers": ["console"],
-        },
-        aiohttp={
-            "level": "DEBUG",
-            "propagate": False,
-            "handlers": ["console"],
-        }
-    ),
-)
+LOGGING_CONF = yaml.load("""
+    version: 1
+
+    formatters:
+      simple:
+        datefmt: '%Y-%m-%d %H:%M:%S',
+        format: '[%(asctime)s][%(name)10s %(levelname)7s] %(message)s'
+
+    handlers:
+      console:
+        class: logging.StreamHandler
+        level: DEBUG
+        formatter: simple
+        stream: ext://sys.stdout
+
+    loggers:
+      simpleExample:
+        level: DEBUG
+        handlers: [console]
+        propagate: no
+
+    root:
+      level: DEBUG
+      handlers: [console]
+""")
 
 INTERNAL_HOST = '127.0.0.1'
 REDIS_HOST = '127.0.0.1'

diff --git a/ircb/irc/__init__.py b/ircb/irc/__init__.py
@@ -8,7 +8,7 @@
 from ircb.storeclient import NetworkStore
 from ircb.storeclient import ChannelStore
 
-logger = logging.getLogger('irc')
+logger = logging.getLogger(__name__)
 
 
 class IrcbIrcConnection(irc3.IrcConnection):

diff --git a/ircb/irc/plugins/autojoins.py b/ircb/irc/plugins/autojoins.py
@@ -12,5 +12,5 @@ def __init__(self, bot):
 
     @irc3.event(irc3.rfc.KICK)
     def on_kick(self, mask, channel, target, **kwargs):
-        # noop for now
+        # noop for now TODO: Address this later
         pass
diff --git a/ircb/lib/dispatcher/__init__.py b/ircb/lib/dispatcher/__init__.py
@@ -8,7 +8,7 @@
 
 from ircb.config import settings
 
-logger = logging.getLogger('dispatcher')
+logger = logging.getLogger(__name__)
 
 
 class Handler(aiozmq.rpc.AttrHandler):

diff --git a/ircb/stores/base.py b/ircb/stores/base.py
@@ -4,7 +4,7 @@
 from ircb.lib.dispatcher import Dispatcher
 from ircb.models.lib import Base
 
-logger = logging.getLogger('stores')
+logger = logging.getLogger(__name__)
 
 
 class BaseStore(object):

diff --git a/ircb/web/app.py b/ircb/web/app.py
@@ -13,7 +13,7 @@
 from ircb.web.network import NetworkConnectionView
 from ircb.utils.config import load_config
 
-logger = logging.getLogger('aiohttp.access')
+logger = logging.getLogger(__name__)
 
 
 @asyncio.coroutine