bcfg2-admin: Logging broken for reports

3 files changed, 10 insertions, 16 deletions

diff --git a/src/lib/Bcfg2/Server/Admin/Reports.py b/src/lib/Bcfg2/Server/Admin/Reports.py
index d38889b52..041eacccc 100644
--- a/src/lib/Bcfg2/Server/Admin/Reports.py
+++ b/src/lib/Bcfg2/Server/Admin/Reports.py
@@ -79,8 +79,6 @@ class Reports(Bcfg2.Server.Admin.Mode):
     __longhelp__ = (__shorthelp__)
     django_commands = ['syncdb', 'sqlall', 'validate']
     __usage__ = ("bcfg2-admin reports [command] [options]\n"
-                 "    -v|--verbose         Be verbose\n"
-                 "    -q|--quiet           Print only errors\n"
                  "\n"
                  "  Commands:\n"
                  "    init                 Initialize the database\n"
@@ -100,7 +98,6 @@ class Reports(Bcfg2.Server.Admin.Mode):
 
     def __init__(self, setup):
         Bcfg2.Server.Admin.Mode.__init__(self, setup)
-        self.log.setLevel(logging.INFO)
 
     def __call__(self, args):
         Bcfg2.Server.Admin.Mode.__call__(self, args)
@@ -108,14 +105,6 @@ class Reports(Bcfg2.Server.Admin.Mode):
             print(self.__usage__)
             raise SystemExit(0)
 
-        verb = 0
-
-        if '-v' in args or '--verbose' in args:
-            self.log.setLevel(logging.DEBUG)
-            verb = 1
-        if '-q' in args or '--quiet' in args:
-            self.log.setLevel(logging.WARNING)
-
         # FIXME - dry run
 
         if args[0] in self.django_commands:
@@ -141,7 +130,7 @@ class Reports(Bcfg2.Server.Admin.Mode):
                     if clients_file[0] == '-':
                         self.errExit("Invalid clients file: %s" % clients_file)
                 i = i + 1
-            self.load_stats(stats_file, clients_file, verb, quick)
+            self.load_stats(stats_file, clients_file, self.log.getEffectiveLevel() > logging.WARNING, quick)
         elif args[0] == 'purge':
             expired = False
             client = None
diff --git a/src/lib/Bcfg2/Server/Reports/updatefix.py b/src/lib/Bcfg2/Server/Reports/updatefix.py
index 61029c6fd..68d333dfb 100644
--- a/src/lib/Bcfg2/Server/Reports/updatefix.py
+++ b/src/lib/Bcfg2/Server/Reports/updatefix.py
@@ -312,9 +312,10 @@ def update_database():
             know_version = know_version[0]
         logger.debug("Presently at %s" % know_version)
         if know_version.version < lastversion:
+            logger.info("upgrading database")
             new_version = rollupdate(know_version.version)
             if new_version:
-                logger.debug("upgraded to %s" % new_version)
+                logger.info("upgraded to %s" % new_version)
     except:
         logger.error("Error while updating the database")
         for x in traceback.format_exc().splitlines():
diff --git a/src/sbin/bcfg2-admin b/src/sbin/bcfg2-admin
index 33f84cd91..44c6c5a44 100755
--- a/src/sbin/bcfg2-admin
+++ b/src/sbin/bcfg2-admin
@@ -44,9 +44,13 @@ def main():
     setup.hm = "%s\n%s" % (setup.buildHelpMessage(), create_description())
     setup.parse(sys.argv[1:])
 
-    log_args = dict(to_syslog=False, to_console=logging.WARNING)
-    if setup['verbose']:
-        log_args['to_console'] = logging.DEBUG
+    if setup['debug']:
+        level = logging.DEBUG
+    elif setup['verbose']:
+        level = logging.INFO
+    else:
+        level = logging.WARNING
+    Bcfg2.Logger.setup_logging('bcfg2-admin', to_syslog=False, level=level)
 
     # Provide help if requested or no args were specified
     if (not setup['args'] or len(setup['args']) < 1 or