From 293d614caa0cfec6b2f403d79ee52de9df8b18cd Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 17 Oct 2012 13:34:51 -0400 Subject: set up bcfg2-info logging just like bcfg2-admin --- src/sbin/bcfg2-info | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src/sbin/bcfg2-info') diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info index 4c5d8f785..efc6041c9 100755 --- a/src/sbin/bcfg2-info +++ b/src/sbin/bcfg2-info @@ -7,6 +7,7 @@ import sys import cmd import getopt import fnmatch +import logging import lxml.etree import traceback from code import InteractiveConsole @@ -122,11 +123,7 @@ class InfoCore(cmd.Cmd, Bcfg2.Server.Core.BaseCore): """Main class for bcfg2-info.""" def __init__(self, setup): cmd.Cmd.__init__(self) - saved = (setup['syslog'], setup['logging']) - setup['syslog'] = False - setup['logging'] = None Bcfg2.Server.Core.BaseCore.__init__(self, setup=setup) - setup['syslog'], setup['logging'] = saved self.prompt = '> ' self.cont = True self.fam.handle_events_in_interval(4) @@ -769,6 +766,15 @@ def main(): USAGE]) setup.parse(sys.argv[1:]) + + 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) -- cgit v1.2.3-1-g7c22