From c424ca4cacae14e5007dc436245fb18fe3591075 Mon Sep 17 00:00:00 2001 From: Tim Laszlo Date: Wed, 23 May 2012 12:50:33 -0500 Subject: bcfg2-admin: Logging broken for reports --- src/lib/Bcfg2/Server/Admin/Reports.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'src/lib/Bcfg2/Server/Admin') 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 -- cgit v1.2.3-1-g7c22