From 0ce253fae4916a81310172798cce4433a600a862 Mon Sep 17 00:00:00 2001 From: Jason Gerard DeRose Date: Tue, 9 Feb 2010 04:57:23 -0700 Subject: Fix logging in CLI and server (take 2) --- ipalib/plugable.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'ipalib/plugable.py') diff --git a/ipalib/plugable.py b/ipalib/plugable.py index 6b2c6f7d0..4473409e1 100644 --- a/ipalib/plugable.py +++ b/ipalib/plugable.py @@ -365,11 +365,16 @@ class API(DictProxy): self.env._finalize_core(**dict(DEFAULT_CONFIG)) log = logging.getLogger() object.__setattr__(self, 'log', log) - if log.level == logging.NOTSET: - if self.env.debug: - log.setLevel(logging.DEBUG) - else: - log.setLevel(logging.INFO) + + # If logging has already been configured somewhere else (like in the + # installer), don't add handlers or change levels: + if len(log.handlers) > 0: + return + + if self.env.debug: + log.setLevel(logging.DEBUG) + else: + log.setLevel(logging.INFO) # Add stderr handler: stderr = logging.StreamHandler() -- cgit