From c8d45e9b36fc742fa8a9d93df63edddb692497e6 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Thu, 13 Dec 2012 11:49:05 -0600 Subject: logging: set log level correctly when no options given --- src/lib/Bcfg2/Logger.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/lib') diff --git a/src/lib/Bcfg2/Logger.py b/src/lib/Bcfg2/Logger.py index 24028f71c..c2eac1e60 100644 --- a/src/lib/Bcfg2/Logger.py +++ b/src/lib/Bcfg2/Logger.py @@ -183,11 +183,17 @@ def setup_logging(procname, to_console=True, to_syslog=True, if to_console: if to_console == True: to_console = logging.WARNING - clvl = min(to_console, level) + if level == 0: + clvl = to_console + else: + clvl = min(to_console, level) params.append("%s to console" % logging.getLevelName(clvl)) add_console_handler(clvl) if to_syslog: - slvl = min(level, logging.INFO) + if level == 0: + slvl = logging.INFO + else: + slvl = min(level, logging.INFO) params.append("%s to syslog" % logging.getLevelName(slvl)) add_syslog_handler(procname, syslog_facility, level=slvl) if to_file is not None: -- cgit v1.2.3-1-g7c22