]> Frank Brehm's Git Trees - pixelpark/admin-tools.git/commitdiff
Changing in logging
authorFrank Brehm <frank.brehm@pixelpark.com>
Mon, 20 Mar 2017 17:18:32 +0000 (18:18 +0100)
committerFrank Brehm <frank.brehm@pixelpark.com>
Mon, 20 Mar 2017 17:18:32 +0000 (18:18 +0100)
pp_lib/cfg_app.py

index 798e22edbc323da69ec31debf9ce8a8fb6de3dbf..3ebaee9492afacec06f8a9a5325042c25605563f 100644 (file)
@@ -324,6 +324,13 @@ class PpConfigApplication(PpApplication):
                     msg = "Wrong file {!r} - ".format(cfg_file) + str(e)
                     self.handle_error(msg, e.__class__.__name__)
                     continue
+            if self.verbose:
+                if 'root' in log_cfg:
+                    log_cfg['root']['level'] = 'DEBUG'
+                if 'handlers' in log_cfg:
+                    for handler_name in log_cfg['handlers'].keys():
+                        handler = log_cfg['handlers'][handler_name]
+                        handler['level'] = 'DEBUG'
             if self.verbose > 1:
                 LOG.debug("Evaluated configuration from JSON:\n{} ...".format(pp(log_cfg)))
             try:
@@ -349,14 +356,11 @@ class PpConfigApplication(PpApplication):
 
         root_logger = logging.getLogger()
 
-#        for log_handler in root_logger.handlers:
-#            root_logger.removeHandler(log_handler)
-
         if self._init_logging_from_jsonfile():
+            if self.verbose:
+                root_logger.setLevel(logging.DEBUG)
             return
 
-#        self.init_logging()
-
         return
 
     # -------------------------------------------------------------------------