From 444be2c0604165608e01679e482be8b0249ece99 Mon Sep 17 00:00:00 2001
From: Peter Schiffer <pschiffe@redhat.com>
Date: Wed, 31 Aug 2016 23:11:04 +0200
Subject: [PATCH] Log to file only if the file exists

If LOG_FILE config option contained invalid file, pdns admin wouldn't start.
Also, it wasn't possible to log only to stdout/stderr correctly, because
setting the log file to /dev/stdout would double the logs messages as the pdns
admin is already logging to the stderr.
---
 app/lib/log.py     | 15 +++++++++------
 config_template.py |  4 ++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/lib/log.py b/app/lib/log.py
index 18d4369..ffdae82 100644
--- a/app/lib/log.py
+++ b/app/lib/log.py
@@ -27,18 +27,21 @@ class logger(object):
         # set request requests module log level
         logging.getLogger("requests").setLevel(logging.CRITICAL)
 
-        # define handler to log into file
-        file_log_handler = logging.FileHandler(self.logfile)
-        logger.addHandler(file_log_handler)
+        if self.logfile and os.path.isfile(self.logfile):
+            # define handler to log into file
+            file_log_handler = logging.FileHandler(self.logfile)
+            logger.addHandler(file_log_handler)
+
+            # define logging format for file
+            file_formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+            file_log_handler.setFormatter(file_formatter)
 
         # define handler to log into console
         stderr_log_handler = logging.StreamHandler()
         logger.addHandler(stderr_log_handler)
 
-        # define logging format for file and console
-        file_formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+        # define logging format for console
         console_formatter = logging.Formatter('[%(levelname)s] %(message)s')
-        file_log_handler.setFormatter(file_formatter)
         stderr_log_handler.setFormatter(console_formatter)
 
         return logging.getLogger(self.name)
\ No newline at end of file
diff --git a/config_template.py b/config_template.py
index 2a55431..288ff47 100644
--- a/config_template.py
+++ b/config_template.py
@@ -14,8 +14,8 @@ TIMEOUT = 10
 # LOG CONFIG
 LOG_LEVEL = 'DEBUG'
 LOG_FILE = 'logfile.log'
-# For Docker, set the following
-#LOG_FILE = '/dev/stdout'
+# For Docker, leave empty string
+#LOG_FILE = ''
 
 # Upload
 UPLOAD_DIR = os.path.join(basedir, 'upload')