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/lib/Bcfg2 | |
| 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/lib/Bcfg2')
| -rw-r--r-- | src/lib/Bcfg2/Server/Core.py | 9 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/models.py | 1 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py index 6eb26b919..027b4c89c 100644 --- a/src/lib/Bcfg2/Server/Core.py +++ b/src/lib/Bcfg2/Server/Core.py @@ -56,17 +56,18 @@ class BaseCore(object): def __init__(self, setup, start_fam_thread=False): self.datastore = setup['repo'] - self.logger = logging.getLogger('bcfg2-server') - if 'debug' in setup and setup['debug']: + if setup['debug']: level = logging.DEBUG - else: + elif setup['verbose']: level = logging.INFO - self.logger.setLevel(level) + else: + level = logging.WARNING Bcfg2.Logger.setup_logging('bcfg2-server', to_console=True, to_syslog=setup['syslog'], to_file=setup['logging'], level=level) + self.logger = logging.getLogger('bcfg2-server') try: fm = Bcfg2.Server.FileMonitor.available[setup['filemonitor']] diff --git a/src/lib/Bcfg2/Server/models.py b/src/lib/Bcfg2/Server/models.py index 2f7a1b8a0..effd4d298 100644 --- a/src/lib/Bcfg2/Server/models.py +++ b/src/lib/Bcfg2/Server/models.py @@ -55,7 +55,6 @@ def load_models(plugins=None, cfile='/etc/bcfg2.conf', quiet=True): for sym in dir(mod): obj = getattr(mod, sym) if hasattr(obj, "__bases__") and models.Model in obj.__bases__: - print("Adding %s to models" % sym) setattr(sys.modules[__name__], sym, obj) MODELS.append(sym) |