From 11636a6e5ad02928b150676be21f090795374153 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Tue, 10 Oct 2006 15:19:17 +0000 Subject: * Respect -v and -d for verbosity git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2426 ce84e21b-d406-0410-9b95-82705330c041 --- src/sbin/bcfg2-server | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server index 8e845a7d4..7f5c42f1e 100755 --- a/src/sbin/bcfg2-server +++ b/src/sbin/bcfg2-server @@ -192,10 +192,6 @@ class Bcfg2Serv(Bcfg2.Server.Component.Component): return "" if __name__ == '__main__': - if '-D' in sys.argv: - Bcfg2.Logging.setup_logging('bcfg2-server', to_console=False) - else: - Bcfg2.Logging.setup_logging('bcfg2-server') OPTINFO = { 'verbose': (('-v', False, 'enable verbose output'), @@ -211,6 +207,15 @@ if __name__ == '__main__': } SSETUP = Bcfg2.Options.OptionParser('bcfg2', OPTINFO).parse() + level = 20 + if self.setup['verbose']: + level = 10 + if self.setup['debug']: + level = 0 + if '-D' in sys.argv: + Bcfg2.Logging.setup_logging('bcfg2-server', to_console=False, level=level) + else: + Bcfg2.Logging.setup_logging('bcfg2-server', level=level) if SSETUP['daemon']: daemonize(SSETUP['daemon']) try: -- cgit v1.2.3-1-g7c22