From 488399e562f81b0835b3d03eda0c9f61744942d9 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 15 Aug 2012 17:04:47 -0400 Subject: made logging levels more consistent in a few places --- src/lib/Bcfg2/Server/Core.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/lib/Bcfg2/Server/Core.py') diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py index 6eb26b919..027b4c89c 100644 --- a/src/lib/Bcfg2/Server/Core.py +++ b/src/lib/Bcfg2/Server/Core.py @@ -56,17 +56,18 @@ class BaseCore(object): def __init__(self, setup, start_fam_thread=False): self.datastore = setup['repo'] - self.logger = logging.getLogger('bcfg2-server') - if 'debug' in setup and setup['debug']: + if setup['debug']: level = logging.DEBUG - else: + elif setup['verbose']: level = logging.INFO - self.logger.setLevel(level) + else: + level = logging.WARNING Bcfg2.Logger.setup_logging('bcfg2-server', to_console=True, to_syslog=setup['syslog'], to_file=setup['logging'], level=level) + self.logger = logging.getLogger('bcfg2-server') try: fm = Bcfg2.Server.FileMonitor.available[setup['filemonitor']] -- cgit v1.2.3-1-g7c22