diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Server/Plugins/Cfg.py | 2 | ||||
| -rwxr-xr-x | src/sbin/bcfg2 | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/Server/Plugins/Cfg.py b/src/lib/Server/Plugins/Cfg.py index 73e078748..60f604849 100644 --- a/src/lib/Server/Plugins/Cfg.py +++ b/src/lib/Server/Plugins/Cfg.py @@ -184,7 +184,7 @@ class ConfigFileEntry(object): else: try: entry.text = filedata - except exceptions.AttributeError: + except: logger.error("Failed to marshall file %s. Mark it as base64" % (entry.get('name'))) class Cfg(Bcfg2.Server.Plugin.Plugin): diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2 index 410114280..370b14c7d 100755 --- a/src/sbin/bcfg2 +++ b/src/sbin/bcfg2 @@ -21,13 +21,6 @@ def cb_sigint_handler(signum, frame): class Client: ''' The main bcfg2 client class ''' def __init__(self): - 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 @@ -71,6 +64,13 @@ class Client: } self.setup = Bcfg2.Options.OptionParser('bcfg2', optinfo).parse() + 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) if self.setup['remove'] not in [False, 'all', 'services', 'packages']: self.logger.error("Got unknown argument %s for -r" % (self.setup['remove'])) |