made logging levels more consistent in a few places

4 files changed, 19 insertions, 11 deletions

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']]
diff --git a/src/lib/Bcfg2/Server/models.py b/src/lib/Bcfg2/Server/models.py
index 2f7a1b8a0..effd4d298 100644
--- a/src/lib/Bcfg2/Server/models.py
+++ b/src/lib/Bcfg2/Server/models.py
@@ -55,7 +55,6 @@ def load_models(plugins=None, cfile='/etc/bcfg2.conf', quiet=True):
         for sym in dir(mod):
             obj = getattr(mod, sym)
             if hasattr(obj, "__bases__") and models.Model in obj.__bases__:
-                print("Adding %s to models" % sym)
                 setattr(sys.modules[__name__], sym, obj)
                 MODELS.append(sym)
 
diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2
index 21de6a3fd..d3d9026b7 100755
--- a/src/sbin/bcfg2
+++ b/src/sbin/bcfg2
@@ -45,11 +45,12 @@ class Client:
             print("Bcfg2 takes no arguments, only options")
             print(self.setup.buildHelpMessage())
             raise SystemExit(1)
-        level = 30
-        if self.setup['verbose']:
-            level = 20
-        if self.setup['debug']:
-            level = 0
+        if setup['debug']:
+            level = logging.DEBUG
+        elif setup['verbose']:
+            level = logging.INFO
+        else:
+            level = logging.WARNING
         Bcfg2.Logger.setup_logging('bcfg2',
                                    to_syslog=self.setup['syslog'],
                                    level=level,
diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info
index 1af4bd8da..289e51589 100755
--- a/src/sbin/bcfg2-info
+++ b/src/sbin/bcfg2-info
@@ -677,7 +677,14 @@ if __name__ == '__main__':
                           USAGE])
 
     setup.parse(sys.argv[1:])
-    Bcfg2.Logger.setup_logging('bcfg2-info', to_syslog=setup['syslog'])
+    if setup['debug']:
+        level = logging.DEBUG
+    elif setup['verbose']:
+        level = logging.INFO
+    else:
+        level = logging.WARNING
+    Bcfg2.Logger.setup_logging('bcfg2-info', to_syslog=False,
+                               level=level)
     if setup['args'] and setup['args'][0] == 'help':
         print(setup.hm)
         sys.exit(0)