james/pgmon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Fix logging

Browse Source
This commit is contained in:
James Campbell 2024-06-07 03:11:07 -04:00
parent 4afa78713f
commit 7bad418850
Signed by: james
GPG Key ID: 2287C33A40DC906A
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pgmon.py
View File

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