summaryrefslogtreecommitdiffstats
path: root/src/sbin
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2006-02-21 22:52:51 +0000
committerNarayan Desai <desai@mcs.anl.gov>2006-02-21 22:52:51 +0000
commit056a24205300a8d7c410b7537c6c31bbf979d8d1 (patch)
tree631a2e2a845206eb63f09d5606ec0ed0a6cffefb /src/sbin
parented7df56e513ad4b3173de0ead803a4654510aff9 (diff)
downloadbcfg2-056a24205300a8d7c410b7537c6c31bbf979d8d1.tar.gz
bcfg2-056a24205300a8d7c410b7537c6c31bbf979d8d1.tar.bz2
bcfg2-056a24205300a8d7c410b7537c6c31bbf979d8d1.zip
Fix output logging
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1761 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/sbin')
-rwxr-xr-xsrc/sbin/bcfg215
1 files changed, 7 insertions, 8 deletions
diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2
index ec2f2fdbc..002dd6058 100755
--- a/src/sbin/bcfg2
+++ b/src/sbin/bcfg2
@@ -16,6 +16,13 @@ def cb_sigint_handler(signum, frame):
class Client:
''' The main bcfg2 client class '''
def __init__(self, args):
+ level = 30
+ if '-v' in sys.argv:
+ level = 20
+ if '-d' in sys.argv:
+ level = 0
+ Bcfg2.Logging.setup_logging('bcfg2', to_syslog=False, level=level)
+ self.logger = logging.getLogger('bcfg2')
self.toolset = None
self.config = None
self.options = {
@@ -89,16 +96,8 @@ class Client:
'password': '<password> ',
'retries': '<number of retries>'
}
-
self.setup = {}
self.get_setup(args)
- level = 30
- if self.setup['verbose']:
- level = 20
- if self.setup['debug']:
- level = 0
- Bcfg2.Logging.setup_logging('bcfg2', to_syslog=False, level=level)
- self.logger = logging.getLogger('bcfg2')
self.logger.debug(self.setup)
def load_toolset(self, toolset_name):