From 7bad4188501161a24ea019c52f03fb1ab694aa38 Mon Sep 17 00:00:00 2001
From: James Campbell <james@shh-dot-com.org>
Date: Fri, 7 Jun 2024 03:11:07 -0400
Subject: [PATCH] Fix logging

---
 pgmon.py | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/pgmon.py b/pgmon.py
index c22789a..62429a5 100755
--- a/pgmon.py
+++ b/pgmon.py
@@ -86,25 +86,26 @@ def init_logging(config):
         else:
             old_file_logger = None
 
-        # Create and add the handler if it doesn't exist
-        if file_log_handler is None:
-            file_log_handler = logging.FileHandler(config.log_file, encoding='utf-8')
-            logger.addHandler(file_log_handler)
-            current_log_file = config.log_file
+        if config.log_file is not None:
+            # Create and add the handler if it doesn't exist
+            if file_log_handler is None:
+                file_log_handler = logging.FileHandler(config.log_file, encoding='utf-8')
+                logger.addHandler(file_log_handler)
+                current_log_file = config.log_file
 
-        # Set the formatter
-        file_log_handler.setFormatter(formatter)
+            # Set the formatter
+            file_log_handler.setFormatter(formatter)
 
-        # Set the log level
-        level = logging.getLevelName(config.file_log_level)
-        file_log_handler.setLevel(level)
+            # Set the log level
+            level = logging.getLevelName(config.file_log_level)
+            file_log_handler.setLevel(level)
 
         # Remove the old handler if there was one
         if old_file_logger is not None:
             logger.removeHandler(old_file_logger)
 
         # Note where logs are being written
-        print("Logging to {} ({})".format(config.log_file, config.file_log_level))
+        #print("Logging to {} ({})".format(config.log_file, config.file_log_level))
     else:
         if file_log_handler is not None:
             logger.removeHandler(file_log_handler)
@@ -214,7 +215,7 @@ class Config:
 
         self.stderr_log_level = 'INFO'      # Log level for stderr logging (or 'off')
         self.file_log_level = 'INFO'        # Log level for file logging (od 'off')
-        self.log_file = 'pgmon.log'         # Log file
+        self.log_file = None                # Log file
 
         self.metrics = {}                   # Metrics
         self.clusters = {}                  # Known clusters
@@ -1088,7 +1089,7 @@ class Server:
                 try:
                     self.reload_config()
                 except Exception as e:
-                    logger.ERROR("Reload failed: {}".format(e))
+                    logger.error("Reload failed: {}".format(e))
 
             # If we just timed out waiting for a request, go back to waiting
             if conn is None:
@@ -1249,10 +1250,11 @@ class Worker(threading.Thread):
                 continue
 
             # Set the result on the request
-            if len(res) == 0:
-                req.set_result("Empty result set")
-            elif metric.type == 'value':
-                req.set_result("{}".format(list(res[0].values())[0]))
+            if metric.type == 'value':
+                if len(res) == 0:
+                    req.set_result("Empty result set")
+                else:
+                    req.set_result("{}".format(list(res[0].values())[0]))
             elif metric.type == 'row':
                 req.set_result(json.dumps(res[0]))
             elif metric.type == 'column':