From 09e0b0d2ed9471fc23c166bbae34db39cfdaa034 Mon Sep 17 00:00:00 2001 From: CMDR furrycat Date: Wed, 26 Oct 2016 10:32:03 +0100 Subject: [PATCH] Handle logging consistently. --- app.py | 1 + plugins/__init__.py | 1 + plugins/feeds.py | 2 -- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app.py b/app.py index d38292c..412f556 100644 --- a/app.py +++ b/app.py @@ -68,6 +68,7 @@ discordlog = logging.getLogger('discord') log = logging.getLogger('catbot') bot.log = log log.setLevel(logging.DEBUG if bot.get('debug') else logging.INFO) +plugins.log_level(log.level) idletime = multiprocessing.Value('i', 900) threads_ready = multiprocessing.Value('b', False) diff --git a/plugins/__init__.py b/plugins/__init__.py index 75e611a..5261b83 100644 --- a/plugins/__init__.py +++ b/plugins/__init__.py @@ -24,6 +24,7 @@ class Plugins(object): module = importlib.reload(self.loaded[name]['module']) else: module = importlib.import_module(name) + module.log = logging.getLogger(name) self.loaded[name] = { 'module': module, 'plugin': getattr(module, plugin)() } except: logging.exception('refresh') diff --git a/plugins/feeds.py b/plugins/feeds.py index 97e02c0..6ad9755 100644 --- a/plugins/feeds.py +++ b/plugins/feeds.py @@ -11,8 +11,6 @@ import time from db import DBConnection import bot -log = logging.getLogger('feeds') - rsstime = multiprocessing.Value('i', 600) class Feeds(DBConnection): -- 2.7.4