From 8a40e9a1ae61ee2011e43e7a67bd1f0a6b4a7eb6 Mon Sep 17 00:00:00 2001 From: Tomas Gavenciak Date: Fri, 10 Sep 2010 21:36:01 +0200 Subject: [PATCH] Fidex several errors in log.py several copy'n'paste errors, forgot to set the level, doc errors, change main log Formatter --- t/moe/log.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/t/moe/log.py b/t/moe/log.py index c2ab4d2..1660a02 100644 --- a/t/moe/log.py +++ b/t/moe/log.py @@ -17,10 +17,8 @@ class Loggers(Logger): `self.test` per-test log, initially no handler, to be directed to file like `{TEST}.log` - Currently, the logs and fd's get never closed. - - TODO: formatters - WARN: Currently, the module changes fd's 1 and 2, this is a global change. + .. note:: Currently, the logs and fd's get never closed. + .. note:: Currently, the `Loggers.open_eval_log` changes fd's 1 and 2 by default, this is a global change. """ def __init__(self): "Initialize loggers as described in class description." @@ -49,20 +47,25 @@ class Loggers(Logger): """Open user (progress) logfile. Leaves logging to stdout active.""" h = StreamHandler(open(filename, 'w', 0)) h.setFormatter(Formatter('%(message)s')) + self.user.setLevel(level) self.user.addHandler(h) self.user.debug('Logging started') def open_eval_log(self, filename, level, redirect_fds = True): - """Open user (progress) logfile. - Leaves logging to stderr active. If told to, redirects fd's 1 and 2 to this file.""" + """Open main logfile. + Leaves logging to stderr active. If told to, redirects fd's 1 and 2 to this file. + Sets level of both `self.eval` and `self`.""" self.eval_file = open(filename, 'w', 0) self.eval_handler = StreamHandler(self.eval_file) - self.eval_handler.setFormatter(Formatter('%(message)s')) - self.user.addHandler(self.eval_handler) + self.eval_handler.setFormatter(Formatter('%(asctime)s [%(levelno)s] %(message)s')) + self.eval.addHandler(self.eval_handler) if redirect_fds: os.dup2(self.eval_file.fileno(), 1) os.dup2(self.eval_file.fileno(), 2) - self.user.debug('Logging started') + self.eval.setLevel(level) + self.setLevel(level) + self.eval.debug('Logging started') + def open_test_log(self, filename, level): """Open per-test log file, like "{TEST}.log". Also set handler level to `level`.""" -- 2.39.2