diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-15 17:04:47 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-15 17:04:54 -0400 |
| commit | 488399e562f81b0835b3d03eda0c9f61744942d9 (patch) | |
| tree | 99618acf148c742254c3bc9cb9761df92b6a9300 /src/sbin | |
| parent | 5e40a53cd81cc08bdc30f20ad7fb7f431b122f87 (diff) | |
| download | bcfg2-488399e562f81b0835b3d03eda0c9f61744942d9.tar.gz bcfg2-488399e562f81b0835b3d03eda0c9f61744942d9.tar.bz2 bcfg2-488399e562f81b0835b3d03eda0c9f61744942d9.zip | |
made logging levels more consistent in a few places
Diffstat (limited to 'src/sbin')
| -rwxr-xr-x | src/sbin/bcfg2 | 11 | ||||
| -rwxr-xr-x | src/sbin/bcfg2-info | 9 |
2 files changed, 14 insertions, 6 deletions
diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2 index 21de6a3fd..d3d9026b7 100755 --- a/src/sbin/bcfg2 +++ b/src/sbin/bcfg2 @@ -45,11 +45,12 @@ class Client: print("Bcfg2 takes no arguments, only options") print(self.setup.buildHelpMessage()) raise SystemExit(1) - level = 30 - if self.setup['verbose']: - level = 20 - if self.setup['debug']: - level = 0 + if setup['debug']: + level = logging.DEBUG + elif setup['verbose']: + level = logging.INFO + else: + level = logging.WARNING Bcfg2.Logger.setup_logging('bcfg2', to_syslog=self.setup['syslog'], level=level, diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info index 1af4bd8da..289e51589 100755 --- a/src/sbin/bcfg2-info +++ b/src/sbin/bcfg2-info @@ -677,7 +677,14 @@ if __name__ == '__main__': USAGE]) setup.parse(sys.argv[1:]) - Bcfg2.Logger.setup_logging('bcfg2-info', to_syslog=setup['syslog']) + 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) |