From 0e67b2c75894a748adbdef9969ae90209bc1acab Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Wed, 7 Nov 2012 21:41:02 +0000 Subject: [PATCH] Tweaked the handling of the syslog module not being available on windows. - Legacy-Id: 5058 --- debug.py | 12 +++++++----- ietf/utils/log.py | 8 ++++++-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/debug.py b/debug.py index 1810bd37c..1c76acf15 100644 --- a/debug.py +++ b/debug.py @@ -3,15 +3,17 @@ import time as timeutils import inspect try: import syslog - write = syslog.syslog + logger = syslog.syslog except ImportError: # import syslog will fail on Windows boxes - import sys - write = lambda x: sys.stderr.write(x+"\n") + import logging + logging.basicConfig(filename='tracker.log',level=logging.INFO) + logger = logging.info + try: from pprint import pformat except ImportError: pformat = lambda x: x - + import cProfile try: from django.conf import settings @@ -118,7 +120,7 @@ def log(name): frame = inspect.stack()[1][0] value = eval(name, frame.f_globals, frame.f_locals) indent = ' ' * (_report_indent[0]) - write("%s%s: %s" % (indent, name, value)) + logger("%s%s: %s" % (indent, name, value)) def pprint(name): if debug: diff --git a/ietf/utils/log.py b/ietf/utils/log.py index 6db2eaf2c..250c6eff9 100644 --- a/ietf/utils/log.py +++ b/ietf/utils/log.py @@ -2,8 +2,12 @@ try: import syslog - write = syslog.syslog + logger = syslog.syslog except ImportError: # import syslog will fail on Windows boxes + import logging + logging.basicConfig(filename='tracker.log',level=logging.INFO) + logger = logging.info + pass import inspect @@ -38,6 +42,6 @@ def log(msg): where = " in " + func + "()" except IndexError: file, line, where = "/", 0, "" - write("ietf%s(%d)%s: %s" % (file, line, where, msg)) + logger("ietf%s(%d)%s: %s" % (file, line, where, msg)) log("IETFdb v%s started" % ietf.__version__)