From 739ffc282faf5f4a5d0207de64f003fb414b19f0 Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank.brehm@pixelpark.com>
Date: Mon, 20 Mar 2017 18:06:18 +0100
Subject: [PATCH] Changing in logging

---
 etc/.gitignore                   |  1 +
 etc/mk-home.logging.json.default | 40 ++++++++++++++++++++++++++++++++
 pp_lib/cfg_app.py                | 10 ++++----
 3 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 etc/mk-home.logging.json.default

diff --git a/etc/.gitignore b/etc/.gitignore
index d2127d0..51e8a4c 100644
--- a/etc/.gitignore
+++ b/etc/.gitignore
@@ -1 +1,2 @@
 *.ini
+mk-home.logging.json
diff --git a/etc/mk-home.logging.json.default b/etc/mk-home.logging.json.default
new file mode 100644
index 0000000..d620b98
--- /dev/null
+++ b/etc/mk-home.logging.json.default
@@ -0,0 +1,40 @@
+{
+    "version": 1,
+    "disable_existing_loggers": false,
+    "handlers": {
+        "console": {
+            "class": "logging.StreamHandler",
+            "level": "DEBUG",
+            "formatter": "console_format"
+        },
+        "file_log": {
+            "class": "logging.handlers.RotatingFileHandler",
+            "level": "DEBUG",
+            "formatter": "logfile_format",
+            "filename": "/var/log/mk_home.log",
+            "encoding": "utf-8",
+            "maxBytes": 10485760,
+            "backupCount": 9
+        }
+    },
+    "formatters": {
+        "console_format": {
+            "format": "[%(levelname)s] %(name)s %(message)s"
+        },
+        "logfile_format": {
+            "format": "[%(asctime)s] [%(levelname)s] %(name)s %(message)s"
+        }
+    },
+    "root": {
+        "level": "INFO",
+        "handlers": [
+            "console",
+            "file_log"
+        ]
+    },
+    "loggers": {
+        "paramiko.transport": {
+            "level": "INFO"
+        }
+    }
+}
diff --git a/pp_lib/cfg_app.py b/pp_lib/cfg_app.py
index af43199..798e22e 100644
--- a/pp_lib/cfg_app.py
+++ b/pp_lib/cfg_app.py
@@ -41,7 +41,7 @@ from .merge import merge_structure
 
 from .app import PpApplication
 
-__version__ = '0.4.3'
+__version__ = '0.4.4'
 LOG = logging.getLogger(__name__)
 
 
@@ -324,6 +324,8 @@ class PpConfigApplication(PpApplication):
                     msg = "Wrong file {!r} - ".format(cfg_file) + str(e)
                     self.handle_error(msg, e.__class__.__name__)
                     continue
+            if self.verbose > 1:
+                LOG.debug("Evaluated configuration from JSON:\n{} ...".format(pp(log_cfg)))
             try:
                 logging.config.dictConfig(log_cfg)
             except Exception as e:
@@ -347,13 +349,13 @@ class PpConfigApplication(PpApplication):
 
         root_logger = logging.getLogger()
 
-        for log_handler in root_logger.handlers:
-            root_logger.removeHandler(log_handler)
+#        for log_handler in root_logger.handlers:
+#            root_logger.removeHandler(log_handler)
 
         if self._init_logging_from_jsonfile():
             return
 
-        self.init_logging()
+#        self.init_logging()
 
         return
 
-- 
2.39.5