diff --git a/config.py b/config.py index de61e9c5e8b56bfef517ba5d4c985717973df4e6..70a1665632fcfd4eaefc5197e473435e09ccebcf 100644 --- a/config.py +++ b/config.py @@ -20,13 +20,13 @@ OHMPI_CONFIG = { CONTROL_CONFIG = { 'tcp_port': 5555, - 'interface': 'mqtt_interface.py' # 'mqtt_interface' + 'interface': 'http_interface.py' # 'mqtt_interface' } # Execution logging configuration EXEC_LOGGING_CONFIG = { 'logging_level': logging.DEBUG, 'logging_to_console': True, - 'file_name': 'ohmpi_log', + 'file_name': 'exec.log', 'max_bytes': 262144, 'backup_count': 30, 'when': 'd', @@ -37,7 +37,7 @@ EXEC_LOGGING_CONFIG = { DATA_LOGGING_CONFIG = { 'logging_level': logging.INFO, 'logging_to_console': True, - 'file_name': 'data_log', + 'file_name': 'data.log', 'max_bytes': 16777216, 'backup_count': 1024, 'when': 'd', @@ -46,7 +46,7 @@ DATA_LOGGING_CONFIG = { # State of Health logging configuration SOH_LOGGING_CONFIG = { - 'file_name': 'soh_log', + 'file_name': 'soh.log', 'logging_to_console': True, 'max_bytes': 16777216, 'backup_count': 1024, @@ -56,7 +56,7 @@ SOH_LOGGING_CONFIG = { # MQTT logging configuration parameters MQTT_LOGGING_CONFIG = { - 'hostname':'mg3d-dev.umons.ac.be', + 'hostname':'ohmpy.umons.ac.be', 'port': 1883, 'qos': 2, 'retain': False, @@ -74,7 +74,7 @@ MQTT_LOGGING_CONFIG = { # MQTT control configuration parameters MQTT_CONTROL_CONFIG = { - 'hostname': 'mg3d-dev.umons.ac.be', + 'hostname': 'ohmpy.umons.ac.be', 'port': 1883, 'qos': 2, 'retain': False, diff --git a/logging_setup.py b/logging_setup.py index 5f6d3b6d9d7fbeb978f2990d3d5e212290fb5ac0..1cc4a9c45a3cdfb210874e1e6535da31ddc15894 100644 --- a/logging_setup.py +++ b/logging_setup.py @@ -13,7 +13,7 @@ def setup_loggers(mqtt=True): log_path = path.join(path.dirname(__file__), 'logs') if not path.isdir(log_path): mkdir(log_path) - exec_log_filename = path.join(log_path, 'msg_log') + exec_log_filename = path.join(log_path, EXEC_LOGGING_CONFIG['file_name']) exec_logger = logging.getLogger('exec_logger') # SOH logging setup @@ -24,7 +24,7 @@ def setup_loggers(mqtt=True): data_path = path.join(base_path, 'data') if not path.isdir(data_path): mkdir(data_path) - data_log_filename = path.join(data_path, 'data_log') + data_log_filename = path.join(data_path, DATA_LOGGING_CONFIG['file_name']) data_logger = logging.getLogger('data_logger') # Set message logging format and level diff --git a/mqtt_logger.py b/mqtt_logger.py index 02f1c041a7c01cac984f900e59fedace065467d3..c497907318e776c9166003e541d59afed2b5514d 100644 --- a/mqtt_logger.py +++ b/mqtt_logger.py @@ -58,5 +58,4 @@ class MQTTHandler(logging.Handler): will=self.will, auth=self.auth, tls=self.tls, protocol=self.protocol, transport=self.transport) except Exception as e: - print(e) - + pass # TODO log in exec ?