From 4c2e7a69be1d63630d27a53d81c09261e98a58fc Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Thu, 3 Nov 2022 15:32:48 +0100
Subject: [PATCH] Adds a seperate logging level for the mqtt loggers
---
config.py | 8 ++++++--
logging_setup.py | 22 ++++++++++++++--------
2 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/config.py b/config.py
index 03ead8f4..8e206ce1 100644
--- a/config.py
+++ b/config.py
@@ -52,8 +52,9 @@ DATA_LOGGING_CONFIG = {
# State of Health logging configuration
SOH_LOGGING_CONFIG = {
- 'file_name': 'soh.log',
+ 'logging_level' : logging.INFO,
'logging_to_console': True,
+ 'file_name': 'soh.log',
'max_bytes': 16777216,
'backup_count': 1024,
'when': 'd',
@@ -74,8 +75,11 @@ MQTT_LOGGING_CONFIG = {
'transport': 'tcp',
'client_id': f'{OHMPI_CONFIG["id"]}',
'exec_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/exec',
+ 'exec_logging_level': logging.DEBUG,
'data_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/data',
- 'soh_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/soh'
+ 'data_logging_level': DATA_LOGGING_CONFIG['logging_level'],
+ 'soh_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/soh',
+ 'soh_logging_level': SOH_LOGGING_CONFIG['logging_level']
}
# MQTT control configuration parameters
diff --git a/logging_setup.py b/logging_setup.py
index e0ced5e8..b80d01fc 100644
--- a/logging_setup.py
+++ b/logging_setup.py
@@ -52,15 +52,18 @@ def setup_loggers(mqtt=True):
if mqtt:
mqtt_settings = MQTT_LOGGING_CONFIG.copy()
- [mqtt_settings.pop(i) for i in ['client_id', 'exec_topic', 'data_topic', 'soh_topic']]
+ mqtt_exec_logging_level = mqtt_settings.pop('exec_logging_level', logging.DEBUG)
+ [mqtt_settings.pop(i) for i in ['client_id', 'exec_topic', 'data_topic', 'soh_topic', 'data_logging_level',
+ 'soh_logging_level']]
mqtt_settings.update({'topic': MQTT_LOGGING_CONFIG['exec_topic']})
# TODO: handle the case of MQTT broker down or temporarily unavailable
try:
mqtt_exec_handler = MQTTHandler(**mqtt_settings)
- mqtt_exec_handler.setLevel(EXEC_LOGGING_CONFIG['logging_level'])
+ mqtt_exec_handler.setLevel(mqtt_exec_logging_level)
mqtt_exec_handler.setFormatter(exec_formatter)
exec_logger.addHandler(mqtt_exec_handler)
- msg+=colored(f"\n\u2611 Publishes execution as {MQTT_LOGGING_CONFIG['exec_topic']} topic on the {MQTT_LOGGING_CONFIG['hostname']} broker", 'blue')
+ msg += colored(f"\n\u2611 Publishes execution as {MQTT_LOGGING_CONFIG['exec_topic']} topic on the "
+ f"{MQTT_LOGGING_CONFIG['hostname']} broker", 'blue')
except Exception as e:
msg += colored(f'\nWarning: Unable to connect to exec topic on broker\n{e}', 'yellow')
mqtt = False
@@ -89,14 +92,17 @@ def setup_loggers(mqtt=True):
if mqtt:
mqtt_settings = MQTT_LOGGING_CONFIG.copy()
- [mqtt_settings.pop(i) for i in ['client_id', 'exec_topic', 'data_topic', 'soh_topic']]
+ mqtt_data_logging_level = mqtt_settings.pop('data_logging_level', logging.INFO)
+ [mqtt_settings.pop(i) for i in ['client_id', 'exec_topic', 'data_topic', 'soh_topic', 'exec_logging_level',
+ 'soh_logging_level']]
mqtt_settings.update({'topic': MQTT_LOGGING_CONFIG['data_topic']})
try:
mqtt_data_handler = MQTTHandler(**mqtt_settings)
- mqtt_data_handler.setLevel(DATA_LOGGING_CONFIG['logging_level'])
+ mqtt_data_handler.setLevel(MQTT_LOGGING_CONFIG['data_logging_level'])
mqtt_data_handler.setFormatter(data_formatter)
data_logger.addHandler(mqtt_data_handler)
- msg += colored(f"\n\u2611 Publishes data as {MQTT_LOGGING_CONFIG['data_topic']} topic on the {MQTT_LOGGING_CONFIG['hostname']} broker", 'blue')
+ msg += colored(f"\n\u2611 Publishes data as {MQTT_LOGGING_CONFIG['data_topic']} topic on the "
+ f"{MQTT_LOGGING_CONFIG['hostname']} broker", 'blue')
except Exception as e:
msg += colored(f'\nWarning: Unable to connect to data topic on broker\n{e}', 'yellow')
mqtt = False
@@ -118,12 +124,12 @@ def init_logging(exec_logger, data_logger, exec_logging_level, log_path, data_lo
exec_logger.info('*** NEW SESSION STARTING ***')
exec_logger.info('****************************')
exec_logger.info('')
- exec_logger.debug('Logging level: %s' % exec_logging_level)
+ exec_logger.debug(f'Logging level: {exec_logging_level}')
try:
st = statvfs('.')
available_space = st.f_bavail * st.f_frsize / 1024 / 1024
exec_logger.info(f'Remaining disk space : {available_space:.1f} MB')
- except Exception as e:
+ except Exception as e: # noqa
exec_logger.debug('Unable to get remaining disk space: {e}')
exec_logger.info('Saving data log to ' + data_log_filename)
config_dict = {'execution logging configuration': json.dumps(EXEC_LOGGING_CONFIG, indent=4),
--
GitLab