From 630febca698f21730ad6307a7240519729a5e7ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eray=20=C3=96zkural?= Date: Tue, 2 May 2006 13:48:10 +0000 Subject: [PATCH] * use a separate log file (/var/log/pisi.log) as onur asked --- pisi/api.py | 10 +++++++--- pisi/cli/__init__.py | 11 +++++------ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/pisi/api.py b/pisi/api.py index 3e66b81a..78e86c45 100644 --- a/pisi/api.py +++ b/pisi/api.py @@ -16,7 +16,7 @@ import os import sys -import syslog +import logging from os.path import exists import bsddb3.db as db @@ -66,7 +66,11 @@ def init(database = True, write = True, else: ctx.ui = ui - syslog.openlog('pisi') # initialize log + logging.basicConfig(level=logging.DEBUG, + format='%(asctime)s %(levelname)-8s %(message)s', + datefmt='%a, %d %b %Y %H:%M:%S', + filename='/var/log/pisi.log', + filemode='w') # If given define stdout and stderr. Needed by buildfarm currently # but others can benefit from this too. @@ -105,7 +109,7 @@ def init(database = True, write = True, def finalize(): if ctx.initialized: - syslog.closelog() + logging.shutdown() pisi.repodb.finalize() pisi.installdb.finalize() diff --git a/pisi/cli/__init__.py b/pisi/cli/__init__.py index aa974c6d..43fcf106 100644 --- a/pisi/cli/__init__.py +++ b/pisi/cli/__init__.py @@ -11,7 +11,7 @@ # import sys -import syslog +import logging import locale import gettext @@ -67,7 +67,6 @@ class CLI(UI): def info(self, msg, verbose = False, noln = False): # TODO: need to look at more kinds of info messages # let's cheat from KDE :) - #syslog.syslog(syslog.LOG_INFO, msg) if noln: msgend = '' else: @@ -76,7 +75,7 @@ class CLI(UI): def warning(self, msg, verbose = False): msg = unicode(msg) - syslog.syslog(syslog.LOG_WARNING, msg) + logging.warning(msg) if ctx.get_option('no_color'): self.output(_('Warning: ') + msg + '\n', err=True, verbose=verbose) else: @@ -84,7 +83,7 @@ class CLI(UI): def error(self, msg): msg = unicode(msg) - syslog.syslog(syslog.LOG_ERROR, msg) + logging.error(msg) if ctx.get_option('no_color'): self.output(_('Error: ') + msg + '\n', err=True) else: @@ -93,7 +92,7 @@ class CLI(UI): def action(self, msg, verbose = False): #TODO: this seems quite redundant? msg = unicode(msg) - syslog.syslog(syslog.LOG_INFO, msg) + logging.info(msg) self.output(colorize(msg + '\n', 'green')) def choose(self, msg, opts): @@ -152,4 +151,4 @@ class CLI(UI): msg = None if msg: self.output(colorize(msg + '\n', 'cyan')) - syslog.syslog(syslog.LOG_NOTICE, msg) + logging.info(msg)