From a04ee72380cc23bc9756261e4bb96942db458db3 Mon Sep 17 00:00:00 2001 From: Landon Jurgens Date: Mon, 18 Apr 2016 11:38:29 -0500 Subject: [PATCH 1/2] Re-ordered the logging to use the module namespace to segregate itself Added a TODO to a hanging comment --- ircb/bouncer.py | 3 +- ircb/config/default_settings.py | 81 +++++++++++---------------------- ircb/irc/__init__.py | 2 +- ircb/irc/plugins/autojoins.py | 2 +- ircb/lib/dispatcher/__init__.py | 2 +- ircb/stores/base.py | 2 +- ircb/web/app.py | 2 +- 7 files changed, 33 insertions(+), 61 deletions(-) diff --git a/ircb/bouncer.py b/ircb/bouncer.py index febe27b..1fe0619 100644 --- 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 index 407b3d5..8b58b0b 100644 --- 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 index b79182e..6863ee4 100644 --- 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 index dd6fb05..92bced9 100644 --- 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 index 7322022..5cd574a 100644 --- 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 index ffd9aa3..3b6914b 100644 --- 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 index 97af16c..320d264 100644 --- 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 From 00419866e5adacd6c767726bb57e4dc4e68c7c34 Mon Sep 17 00:00:00 2001 From: Landon Jurgens Date: Mon, 18 Apr 2016 15:24:01 -0500 Subject: [PATCH 2/2] Simple pep8 to fix travisCI issue --- ircb/cli/main.py | 1 + ircb/utils/config.py | 1 + 2 files changed, 2 insertions(+) diff --git a/ircb/cli/main.py b/ircb/cli/main.py index 7dfb618..c25f57e 100644 --- a/ircb/cli/main.py +++ b/ircb/cli/main.py @@ -6,6 +6,7 @@ from ircb.cli.user import user_cli from ircb.utils.config import load_config + @click.group() def cli(): """ircb CLI""" diff --git a/ircb/utils/config.py b/ircb/utils/config.py index d6922aa..3e0394b 100644 --- a/ircb/utils/config.py +++ b/ircb/utils/config.py @@ -3,5 +3,6 @@ from ircb.config import settings + def load_config(): logging.config.dictConfig(settings.LOGGING_CONF)