diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Database.py | 4 | ||||
| -rw-r--r-- | src/EventManager.py | 4 | ||||
| -rw-r--r-- | src/IRCBot.py | 6 | ||||
| -rw-r--r-- | src/Logging.py | 25 |
4 files changed, 26 insertions, 13 deletions
diff --git a/src/Database.py b/src/Database.py index 85772243..b159ca4f 100644 --- a/src/Database.py +++ b/src/Database.py @@ -272,7 +272,7 @@ class Database(object): def _execute_fetch(self, query, fetch_func, params=[]): printable_query = " ".join(query.split()) - self.log.debug("executing query: \"%s\" (params: %s)", + self.log.trace("executing query: \"%s\" (params: %s)", [printable_query, params]) start = time.monotonic() @@ -282,7 +282,7 @@ class Database(object): end = time.monotonic() total_milliseconds = (end - start) * 1000 - self.log.debug("executed in %fms", [total_milliseconds]) + self.log.trace("executed in %fms", [total_milliseconds]) return value def execute_fetchall(self, query, params=[]): diff --git a/src/EventManager.py b/src/EventManager.py index 720fe0a1..7f397b0d 100644 --- a/src/EventManager.py +++ b/src/EventManager.py @@ -200,7 +200,7 @@ class EventHook(object): return self._call(kwargs, maximum=maximum) def _call(self, kwargs, maximum=None): event_path = self._get_path() - self.log.debug("calling event: \"%s\" (params: %s)", + self.log.trace("calling event: \"%s\" (params: %s)", [event_path, kwargs]) start = time.monotonic() @@ -217,7 +217,7 @@ class EventHook(object): event_path], exc_info=True) total_milliseconds = (time.monotonic() - start) * 1000 - self.log.debug("event \"%s\" called in %fms", [ + self.log.trace("event \"%s\" called in %fms", [ event_path, total_milliseconds]) self.check_purge() diff --git a/src/IRCBot.py b/src/IRCBot.py index a776d8d6..e27165de 100644 --- a/src/IRCBot.py +++ b/src/IRCBot.py @@ -133,11 +133,7 @@ class Bot(object): if event & select.EPOLLIN: lines = server.read() for line in lines: - if self.args.verbose: - self.log.info("<%s | %s", [str(server), line]) - else: - self.log.debug("%s (raw) | %s", [str(server), - line]) + self.log.debug("%s (raw) | %s", [str(server), line]) server.parse_line(line) elif event & select.EPOLLOUT: server._send() diff --git a/src/Logging.py b/src/Logging.py index e08160f4..1c33df94 100644 --- a/src/Logging.py +++ b/src/Logging.py @@ -1,5 +1,14 @@ import logging, logging.handlers, os, sys, time +LEVELS = { + "trace": 5, + "debug": logging.DEBUG, + "info": logging.INFO, + "warn": logging.WARN, + "error": logging.ERROR, + "critical": logging.CRITICAL +} + class BitBotFormatter(logging.Formatter): def formatTime(self, record, datefmt=None): ct = self.converter(record.created) @@ -14,9 +23,15 @@ class BitBotFormatter(logging.Formatter): return s class Log(object): - def __init__(self, location): + def __init__(self, level, location): + logging.addLevelName(LEVELS["trace"], "TRACE") self.logger = logging.getLogger(__name__) - self.logger.setLevel(logging.DEBUG) + + if not level.lower() in LEVELS: + raise ValueError("Unknown log level '%s'" % level) + stdout_level = LEVELS[level.lower()] + + self.logger.setLevel(LEVELS["trace"]) formatter = BitBotFormatter( "%(asctime)s [%(levelname)s] %(message)s", @@ -24,16 +39,18 @@ class Log(object): formatter.converter = time.gmtime stdout_handler = logging.StreamHandler(sys.stdout) - stdout_handler.setLevel(logging.INFO) + stdout_handler.setLevel(stdout_level) stdout_handler.setFormatter(formatter) self.logger.addHandler(stdout_handler) file_handler = logging.handlers.TimedRotatingFileHandler( location, when="midnight", backupCount=5) - file_handler.setLevel(logging.DEBUG) + file_handler.setLevel(LEVELS["trace"]) file_handler.setFormatter(formatter) self.logger.addHandler(file_handler) + def trace(self, message, params, **kwargs): + self._log(message, params, LEVELS["trace"], kwargs) def debug(self, message, params, **kwargs): self._log(message, params, logging.DEBUG, kwargs) def info(self, message, params, **kwargs): |