diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-12-13 11:49:05 -0600 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-12-13 11:49:05 -0600 |
commit | c8d45e9b36fc742fa8a9d93df63edddb692497e6 (patch) | |
tree | 313f8c881648b7adb47da2442b63b2ee0462bad9 | |
parent | 735b66606e25b20089b653977c23115e30170a1f (diff) | |
download | bcfg2-c8d45e9b36fc742fa8a9d93df63edddb692497e6.tar.gz bcfg2-c8d45e9b36fc742fa8a9d93df63edddb692497e6.tar.bz2 bcfg2-c8d45e9b36fc742fa8a9d93df63edddb692497e6.zip |
logging: set log level correctly when no options given
-rw-r--r-- | src/lib/Bcfg2/Logger.py | 10 |
1 files changed, 8 insertions, 2 deletions
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: |