| |
@@ -289,18 +289,8 @@
|
| |
def __len__(self):
|
| |
return len(self.__dict__.keys())
|
| |
|
| |
- log_simple_handler = logging.StreamHandler()
|
| |
- log_simple_handler.setFormatter(
|
| |
- logging.Formatter('%(message)s')
|
| |
- )
|
| |
|
| |
- log_verbose_handler = logging.StreamHandler()
|
| |
- log_verbose_handler.setFormatter(
|
| |
- logging.Formatter('%(levelname)s: %(message)s')
|
| |
- )
|
| |
-
|
| |
-
|
| |
- def reset_get_logger(name, verbose=False):
|
| |
+ def setup_script_logger(name, verbose=False):
|
| |
"""Reset the python logging system for STDOUT, and attach a new
|
| |
console logger with cli expected formatting.
|
| |
|
| |
@@ -311,21 +301,18 @@
|
| |
:return: logging.logger
|
| |
"""
|
| |
root = logging.getLogger()
|
| |
- if root.handlers:
|
| |
- for handler in root.handlers:
|
| |
- root.removeHandler(handler)
|
| |
-
|
| |
- if verbose:
|
| |
- root.addHandler(log_verbose_handler)
|
| |
- else:
|
| |
- root.addHandler(log_simple_handler)
|
| |
-
|
| |
log = logging.getLogger(name)
|
| |
+ log_handler = logging.StreamHandler()
|
| |
|
| |
if verbose:
|
| |
log.setLevel(logging.DEBUG)
|
| |
+ log_format = '%(levelname)s: %(message)s'
|
| |
else:
|
| |
log.setLevel(logging.INFO)
|
| |
+ log_format = '%(message)s'
|
| |
+
|
| |
+ log_handler.setFormatter(logging.Formatter(log_format))
|
| |
+ root.addHandler(log_handler)
|
| |
|
| |
return log
|
| |
|
| |
Bug description: lib389 was calling
logging.basicConfig()
at several places at module scope level. This was causing
imports from these modules to add an unwanted handler
to the root logger of the python's standard logging module.
Fix description: Set up logging only in the scripts that are
using lib389.
ALso, remove unused imports in init.py
https://pagure.io/389-ds-base/issue/49844
Reviewed by: spichugi