From 0cb65339a3286134fd7c9d1ba74e761b3a72dada Mon Sep 17 00:00:00 2001 From: su530201 <olivier.kaufmann@umons.ac.be> Date: Fri, 2 Feb 2024 13:41:17 +0100 Subject: [PATCH] Changes default logging setup in generated configs --- configs/config_mb_2023.py | 6 +++--- configs/config_mb_2023__1_mux_2024_4roles.py | 6 +++--- configs/config_mb_2023__2_mux_2024_2roles.py | 6 +++--- configs/config_mb_2023__2_mux_2024_4roles.py | 6 +++--- configs/config_mb_2023__3_mux_2024_4roles.py | 6 +++--- configs/config_mb_2023__4_mux_2023.py | 6 +++--- configs/config_mb_2023__4_mux_2024_2roles.py | 6 +++--- configs/config_mb_2023__4_mux_2024_4roles.py | 6 +++--- configs/config_mb_2024_0_2.py | 6 +++--- configs/config_mb_2024_0_2__1_mux_2024_4roles.py | 6 +++--- configs/config_mb_2024_0_2__1_mux_2024_4roles_dps5005.py | 6 +++--- configs/config_mb_2024_0_2__2_mux_2024_2roles.py | 6 +++--- configs/config_mb_2024_0_2__2_mux_2024_2roles_dps5005.py | 6 +++--- configs/config_mb_2024_0_2__2_mux_2024_4roles.py | 6 +++--- configs/config_mb_2024_0_2__2_mux_2024_4roles_dps5005.py | 6 +++--- configs/config_mb_2024_0_2__3_mux_2024_4roles.py | 6 +++--- configs/config_mb_2024_0_2__3_mux_2024_4roles_dps5005.py | 6 +++--- configs/config_mb_2024_0_2__4_mux_2023.py | 6 +++--- configs/config_mb_2024_0_2__4_mux_2023_dps5005.py | 6 +++--- configs/config_mb_2024_0_2__4_mux_2024_2roles.py | 6 +++--- configs/config_mb_2024_0_2__4_mux_2024_2roles_dps5005.py | 6 +++--- configs/config_mb_2024_0_2__4_mux_2024_4roles.py | 6 +++--- configs/config_mb_2024_0_2__4_mux_2024_4roles_dps5005.py | 6 +++--- configs/config_mb_2024_0_2_dps5005.py | 6 +++--- ohmpi/hardware_components/pwr_dps5005.py | 2 ++ ohmpi/hardware_system.py | 2 +- ohmpi/utils.py | 6 +++--- 27 files changed, 78 insertions(+), 76 deletions(-) diff --git a/configs/config_mb_2023.py b/configs/config_mb_2023.py index b083d845..7a2dbbc0 100644 --- a/configs/config_mb_2023.py +++ b/configs/config_mb_2023.py @@ -45,7 +45,7 @@ HARDWARE_CONFIG = { # Execution logging configuration EXEC_LOGGING_CONFIG = { 'logging_level': logging.INFO, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'logging_to_console': True, 'file_name': f'exec{logging_suffix}.log', 'max_bytes': 262144, @@ -69,7 +69,7 @@ DATA_LOGGING_CONFIG = { SOH_LOGGING_CONFIG = { 'logging_level': logging.INFO, 'logging_to_console': True, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'file_name': f'soh{logging_suffix}.log', 'max_bytes': 16777216, 'backup_count': 1024, @@ -91,7 +91,7 @@ MQTT_LOGGING_CONFIG = { 'transport': 'tcp', 'client_id': f'{OHMPI_CONFIG["id"]}', 'exec_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/exec', - 'exec_logging_level': logging.DEBUG, + 'exec_logging_level': EXEC_LOGGING_CONFIG['logging_level'], 'data_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/data', 'data_logging_level': DATA_LOGGING_CONFIG['logging_level'], 'soh_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/soh', diff --git a/configs/config_mb_2023__1_mux_2024_4roles.py b/configs/config_mb_2023__1_mux_2024_4roles.py index fe490e09..f3d5e75e 100644 --- a/configs/config_mb_2023__1_mux_2024_4roles.py +++ b/configs/config_mb_2023__1_mux_2024_4roles.py @@ -56,7 +56,7 @@ HARDWARE_CONFIG = { # Execution logging configuration EXEC_LOGGING_CONFIG = { 'logging_level': logging.INFO, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'logging_to_console': True, 'file_name': f'exec{logging_suffix}.log', 'max_bytes': 262144, @@ -80,7 +80,7 @@ DATA_LOGGING_CONFIG = { SOH_LOGGING_CONFIG = { 'logging_level': logging.INFO, 'logging_to_console': True, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'file_name': f'soh{logging_suffix}.log', 'max_bytes': 16777216, 'backup_count': 1024, @@ -102,7 +102,7 @@ MQTT_LOGGING_CONFIG = { 'transport': 'tcp', 'client_id': f'{OHMPI_CONFIG["id"]}', 'exec_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/exec', - 'exec_logging_level': logging.DEBUG, + 'exec_logging_level': EXEC_LOGGING_CONFIG['logging_level'], 'data_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/data', 'data_logging_level': DATA_LOGGING_CONFIG['logging_level'], 'soh_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/soh', diff --git a/configs/config_mb_2023__2_mux_2024_2roles.py b/configs/config_mb_2023__2_mux_2024_2roles.py index 30723240..79a89361 100644 --- a/configs/config_mb_2023__2_mux_2024_2roles.py +++ b/configs/config_mb_2023__2_mux_2024_2roles.py @@ -66,7 +66,7 @@ HARDWARE_CONFIG = { # Execution logging configuration EXEC_LOGGING_CONFIG = { 'logging_level': logging.INFO, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'logging_to_console': True, 'file_name': f'exec{logging_suffix}.log', 'max_bytes': 262144, @@ -90,7 +90,7 @@ DATA_LOGGING_CONFIG = { SOH_LOGGING_CONFIG = { 'logging_level': logging.INFO, 'logging_to_console': True, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'file_name': f'soh{logging_suffix}.log', 'max_bytes': 16777216, 'backup_count': 1024, @@ -112,7 +112,7 @@ MQTT_LOGGING_CONFIG = { 'transport': 'tcp', 'client_id': f'{OHMPI_CONFIG["id"]}', 'exec_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/exec', - 'exec_logging_level': logging.DEBUG, + 'exec_logging_level': EXEC_LOGGING_CONFIG['logging_level'], 'data_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/data', 'data_logging_level': DATA_LOGGING_CONFIG['logging_level'], 'soh_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/soh', diff --git a/configs/config_mb_2023__2_mux_2024_4roles.py b/configs/config_mb_2023__2_mux_2024_4roles.py index ffa2f336..49b55c58 100644 --- a/configs/config_mb_2023__2_mux_2024_4roles.py +++ b/configs/config_mb_2023__2_mux_2024_4roles.py @@ -64,7 +64,7 @@ HARDWARE_CONFIG = { # Execution logging configuration EXEC_LOGGING_CONFIG = { 'logging_level': logging.INFO, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'logging_to_console': True, 'file_name': f'exec{logging_suffix}.log', 'max_bytes': 262144, @@ -88,7 +88,7 @@ DATA_LOGGING_CONFIG = { SOH_LOGGING_CONFIG = { 'logging_level': logging.INFO, 'logging_to_console': True, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'file_name': f'soh{logging_suffix}.log', 'max_bytes': 16777216, 'backup_count': 1024, @@ -110,7 +110,7 @@ MQTT_LOGGING_CONFIG = { 'transport': 'tcp', 'client_id': f'{OHMPI_CONFIG["id"]}', 'exec_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/exec', - 'exec_logging_level': logging.DEBUG, + 'exec_logging_level': EXEC_LOGGING_CONFIG['logging_level'], 'data_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/data', 'data_logging_level': DATA_LOGGING_CONFIG['logging_level'], 'soh_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/soh', diff --git a/configs/config_mb_2023__3_mux_2024_4roles.py b/configs/config_mb_2023__3_mux_2024_4roles.py index 1d4415c4..b2866f8b 100644 --- a/configs/config_mb_2023__3_mux_2024_4roles.py +++ b/configs/config_mb_2023__3_mux_2024_4roles.py @@ -72,7 +72,7 @@ HARDWARE_CONFIG = { # Execution logging configuration EXEC_LOGGING_CONFIG = { 'logging_level': logging.INFO, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'logging_to_console': True, 'file_name': f'exec{logging_suffix}.log', 'max_bytes': 262144, @@ -96,7 +96,7 @@ DATA_LOGGING_CONFIG = { SOH_LOGGING_CONFIG = { 'logging_level': logging.INFO, 'logging_to_console': True, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'file_name': f'soh{logging_suffix}.log', 'max_bytes': 16777216, 'backup_count': 1024, @@ -118,7 +118,7 @@ MQTT_LOGGING_CONFIG = { 'transport': 'tcp', 'client_id': f'{OHMPI_CONFIG["id"]}', 'exec_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/exec', - 'exec_logging_level': logging.DEBUG, + 'exec_logging_level': EXEC_LOGGING_CONFIG['logging_level'], 'data_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/data', 'data_logging_level': DATA_LOGGING_CONFIG['logging_level'], 'soh_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/soh', diff --git a/configs/config_mb_2023__4_mux_2023.py b/configs/config_mb_2023__4_mux_2023.py index d087bc46..e6a10d18 100644 --- a/configs/config_mb_2023__4_mux_2023.py +++ b/configs/config_mb_2023__4_mux_2023.py @@ -72,7 +72,7 @@ HARDWARE_CONFIG = { # Execution logging configuration EXEC_LOGGING_CONFIG = { 'logging_level': logging.INFO, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'logging_to_console': True, 'file_name': f'exec{logging_suffix}.log', 'max_bytes': 262144, @@ -96,7 +96,7 @@ DATA_LOGGING_CONFIG = { SOH_LOGGING_CONFIG = { 'logging_level': logging.INFO, 'logging_to_console': True, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'file_name': f'soh{logging_suffix}.log', 'max_bytes': 16777216, 'backup_count': 1024, @@ -118,7 +118,7 @@ MQTT_LOGGING_CONFIG = { 'transport': 'tcp', 'client_id': f'{OHMPI_CONFIG["id"]}', 'exec_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/exec', - 'exec_logging_level': logging.DEBUG, + 'exec_logging_level': EXEC_LOGGING_CONFIG['logging_level'], 'data_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/data', 'data_logging_level': DATA_LOGGING_CONFIG['logging_level'], 'soh_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/soh', diff --git a/configs/config_mb_2023__4_mux_2024_2roles.py b/configs/config_mb_2023__4_mux_2024_2roles.py index 202b520b..5b941d6a 100644 --- a/configs/config_mb_2023__4_mux_2024_2roles.py +++ b/configs/config_mb_2023__4_mux_2024_2roles.py @@ -83,7 +83,7 @@ HARDWARE_CONFIG = { # Execution logging configuration EXEC_LOGGING_CONFIG = { 'logging_level': logging.INFO, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'logging_to_console': True, 'file_name': f'exec{logging_suffix}.log', 'max_bytes': 262144, @@ -107,7 +107,7 @@ DATA_LOGGING_CONFIG = { SOH_LOGGING_CONFIG = { 'logging_level': logging.INFO, 'logging_to_console': True, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'file_name': f'soh{logging_suffix}.log', 'max_bytes': 16777216, 'backup_count': 1024, @@ -129,7 +129,7 @@ MQTT_LOGGING_CONFIG = { 'transport': 'tcp', 'client_id': f'{OHMPI_CONFIG["id"]}', 'exec_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/exec', - 'exec_logging_level': logging.DEBUG, + 'exec_logging_level': EXEC_LOGGING_CONFIG['logging_level'], 'data_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/data', 'data_logging_level': DATA_LOGGING_CONFIG['logging_level'], 'soh_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/soh', diff --git a/configs/config_mb_2023__4_mux_2024_4roles.py b/configs/config_mb_2023__4_mux_2024_4roles.py index 3275eaca..f71e8c6d 100644 --- a/configs/config_mb_2023__4_mux_2024_4roles.py +++ b/configs/config_mb_2023__4_mux_2024_4roles.py @@ -80,7 +80,7 @@ HARDWARE_CONFIG = { # Execution logging configuration EXEC_LOGGING_CONFIG = { 'logging_level': logging.INFO, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'logging_to_console': True, 'file_name': f'exec{logging_suffix}.log', 'max_bytes': 262144, @@ -104,7 +104,7 @@ DATA_LOGGING_CONFIG = { SOH_LOGGING_CONFIG = { 'logging_level': logging.INFO, 'logging_to_console': True, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'file_name': f'soh{logging_suffix}.log', 'max_bytes': 16777216, 'backup_count': 1024, @@ -126,7 +126,7 @@ MQTT_LOGGING_CONFIG = { 'transport': 'tcp', 'client_id': f'{OHMPI_CONFIG["id"]}', 'exec_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/exec', - 'exec_logging_level': logging.DEBUG, + 'exec_logging_level': EXEC_LOGGING_CONFIG['logging_level'], 'data_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/data', 'data_logging_level': DATA_LOGGING_CONFIG['logging_level'], 'soh_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/soh', diff --git a/configs/config_mb_2024_0_2.py b/configs/config_mb_2024_0_2.py index fe49f9aa..9889e65d 100644 --- a/configs/config_mb_2024_0_2.py +++ b/configs/config_mb_2024_0_2.py @@ -46,7 +46,7 @@ HARDWARE_CONFIG = { # Execution logging configuration EXEC_LOGGING_CONFIG = { 'logging_level': logging.INFO, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'logging_to_console': True, 'file_name': f'exec{logging_suffix}.log', 'max_bytes': 262144, @@ -70,7 +70,7 @@ DATA_LOGGING_CONFIG = { SOH_LOGGING_CONFIG = { 'logging_level': logging.INFO, 'logging_to_console': True, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'file_name': f'soh{logging_suffix}.log', 'max_bytes': 16777216, 'backup_count': 1024, @@ -92,7 +92,7 @@ MQTT_LOGGING_CONFIG = { 'transport': 'tcp', 'client_id': f'{OHMPI_CONFIG["id"]}', 'exec_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/exec', - 'exec_logging_level': logging.DEBUG, + 'exec_logging_level': EXEC_LOGGING_CONFIG['logging_level'], 'data_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/data', 'data_logging_level': DATA_LOGGING_CONFIG['logging_level'], 'soh_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/soh', diff --git a/configs/config_mb_2024_0_2__1_mux_2024_4roles.py b/configs/config_mb_2024_0_2__1_mux_2024_4roles.py index 15260595..8cc03be9 100644 --- a/configs/config_mb_2024_0_2__1_mux_2024_4roles.py +++ b/configs/config_mb_2024_0_2__1_mux_2024_4roles.py @@ -57,7 +57,7 @@ HARDWARE_CONFIG = { # Execution logging configuration EXEC_LOGGING_CONFIG = { 'logging_level': logging.INFO, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'logging_to_console': True, 'file_name': f'exec{logging_suffix}.log', 'max_bytes': 262144, @@ -81,7 +81,7 @@ DATA_LOGGING_CONFIG = { SOH_LOGGING_CONFIG = { 'logging_level': logging.INFO, 'logging_to_console': True, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'file_name': f'soh{logging_suffix}.log', 'max_bytes': 16777216, 'backup_count': 1024, @@ -103,7 +103,7 @@ MQTT_LOGGING_CONFIG = { 'transport': 'tcp', 'client_id': f'{OHMPI_CONFIG["id"]}', 'exec_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/exec', - 'exec_logging_level': logging.DEBUG, + 'exec_logging_level': EXEC_LOGGING_CONFIG['logging_level'], 'data_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/data', 'data_logging_level': DATA_LOGGING_CONFIG['logging_level'], 'soh_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/soh', diff --git a/configs/config_mb_2024_0_2__1_mux_2024_4roles_dps5005.py b/configs/config_mb_2024_0_2__1_mux_2024_4roles_dps5005.py index 9b243ab8..79194710 100644 --- a/configs/config_mb_2024_0_2__1_mux_2024_4roles_dps5005.py +++ b/configs/config_mb_2024_0_2__1_mux_2024_4roles_dps5005.py @@ -57,7 +57,7 @@ HARDWARE_CONFIG = { # Execution logging configuration EXEC_LOGGING_CONFIG = { 'logging_level': logging.INFO, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'logging_to_console': True, 'file_name': f'exec{logging_suffix}.log', 'max_bytes': 262144, @@ -81,7 +81,7 @@ DATA_LOGGING_CONFIG = { SOH_LOGGING_CONFIG = { 'logging_level': logging.INFO, 'logging_to_console': True, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'file_name': f'soh{logging_suffix}.log', 'max_bytes': 16777216, 'backup_count': 1024, @@ -103,7 +103,7 @@ MQTT_LOGGING_CONFIG = { 'transport': 'tcp', 'client_id': f'{OHMPI_CONFIG["id"]}', 'exec_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/exec', - 'exec_logging_level': logging.DEBUG, + 'exec_logging_level': EXEC_LOGGING_CONFIG['logging_level'], 'data_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/data', 'data_logging_level': DATA_LOGGING_CONFIG['logging_level'], 'soh_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/soh', diff --git a/configs/config_mb_2024_0_2__2_mux_2024_2roles.py b/configs/config_mb_2024_0_2__2_mux_2024_2roles.py index f7410571..a8de7e03 100644 --- a/configs/config_mb_2024_0_2__2_mux_2024_2roles.py +++ b/configs/config_mb_2024_0_2__2_mux_2024_2roles.py @@ -67,7 +67,7 @@ HARDWARE_CONFIG = { # Execution logging configuration EXEC_LOGGING_CONFIG = { 'logging_level': logging.INFO, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'logging_to_console': True, 'file_name': f'exec{logging_suffix}.log', 'max_bytes': 262144, @@ -91,7 +91,7 @@ DATA_LOGGING_CONFIG = { SOH_LOGGING_CONFIG = { 'logging_level': logging.INFO, 'logging_to_console': True, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'file_name': f'soh{logging_suffix}.log', 'max_bytes': 16777216, 'backup_count': 1024, @@ -113,7 +113,7 @@ MQTT_LOGGING_CONFIG = { 'transport': 'tcp', 'client_id': f'{OHMPI_CONFIG["id"]}', 'exec_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/exec', - 'exec_logging_level': logging.DEBUG, + 'exec_logging_level': EXEC_LOGGING_CONFIG['logging_level'], 'data_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/data', 'data_logging_level': DATA_LOGGING_CONFIG['logging_level'], 'soh_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/soh', diff --git a/configs/config_mb_2024_0_2__2_mux_2024_2roles_dps5005.py b/configs/config_mb_2024_0_2__2_mux_2024_2roles_dps5005.py index bc7c5478..dcfdffcc 100644 --- a/configs/config_mb_2024_0_2__2_mux_2024_2roles_dps5005.py +++ b/configs/config_mb_2024_0_2__2_mux_2024_2roles_dps5005.py @@ -67,7 +67,7 @@ HARDWARE_CONFIG = { # Execution logging configuration EXEC_LOGGING_CONFIG = { 'logging_level': logging.INFO, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'logging_to_console': True, 'file_name': f'exec{logging_suffix}.log', 'max_bytes': 262144, @@ -91,7 +91,7 @@ DATA_LOGGING_CONFIG = { SOH_LOGGING_CONFIG = { 'logging_level': logging.INFO, 'logging_to_console': True, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'file_name': f'soh{logging_suffix}.log', 'max_bytes': 16777216, 'backup_count': 1024, @@ -113,7 +113,7 @@ MQTT_LOGGING_CONFIG = { 'transport': 'tcp', 'client_id': f'{OHMPI_CONFIG["id"]}', 'exec_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/exec', - 'exec_logging_level': logging.DEBUG, + 'exec_logging_level': EXEC_LOGGING_CONFIG['logging_level'], 'data_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/data', 'data_logging_level': DATA_LOGGING_CONFIG['logging_level'], 'soh_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/soh', diff --git a/configs/config_mb_2024_0_2__2_mux_2024_4roles.py b/configs/config_mb_2024_0_2__2_mux_2024_4roles.py index 78903cd0..0b362a7e 100644 --- a/configs/config_mb_2024_0_2__2_mux_2024_4roles.py +++ b/configs/config_mb_2024_0_2__2_mux_2024_4roles.py @@ -65,7 +65,7 @@ HARDWARE_CONFIG = { # Execution logging configuration EXEC_LOGGING_CONFIG = { 'logging_level': logging.INFO, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'logging_to_console': True, 'file_name': f'exec{logging_suffix}.log', 'max_bytes': 262144, @@ -89,7 +89,7 @@ DATA_LOGGING_CONFIG = { SOH_LOGGING_CONFIG = { 'logging_level': logging.INFO, 'logging_to_console': True, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'file_name': f'soh{logging_suffix}.log', 'max_bytes': 16777216, 'backup_count': 1024, @@ -111,7 +111,7 @@ MQTT_LOGGING_CONFIG = { 'transport': 'tcp', 'client_id': f'{OHMPI_CONFIG["id"]}', 'exec_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/exec', - 'exec_logging_level': logging.DEBUG, + 'exec_logging_level': EXEC_LOGGING_CONFIG['logging_level'], 'data_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/data', 'data_logging_level': DATA_LOGGING_CONFIG['logging_level'], 'soh_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/soh', diff --git a/configs/config_mb_2024_0_2__2_mux_2024_4roles_dps5005.py b/configs/config_mb_2024_0_2__2_mux_2024_4roles_dps5005.py index 308cf8f1..0b6ab6a0 100644 --- a/configs/config_mb_2024_0_2__2_mux_2024_4roles_dps5005.py +++ b/configs/config_mb_2024_0_2__2_mux_2024_4roles_dps5005.py @@ -65,7 +65,7 @@ HARDWARE_CONFIG = { # Execution logging configuration EXEC_LOGGING_CONFIG = { 'logging_level': logging.INFO, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'logging_to_console': True, 'file_name': f'exec{logging_suffix}.log', 'max_bytes': 262144, @@ -89,7 +89,7 @@ DATA_LOGGING_CONFIG = { SOH_LOGGING_CONFIG = { 'logging_level': logging.INFO, 'logging_to_console': True, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'file_name': f'soh{logging_suffix}.log', 'max_bytes': 16777216, 'backup_count': 1024, @@ -111,7 +111,7 @@ MQTT_LOGGING_CONFIG = { 'transport': 'tcp', 'client_id': f'{OHMPI_CONFIG["id"]}', 'exec_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/exec', - 'exec_logging_level': logging.DEBUG, + 'exec_logging_level': EXEC_LOGGING_CONFIG['logging_level'], 'data_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/data', 'data_logging_level': DATA_LOGGING_CONFIG['logging_level'], 'soh_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/soh', diff --git a/configs/config_mb_2024_0_2__3_mux_2024_4roles.py b/configs/config_mb_2024_0_2__3_mux_2024_4roles.py index 038e010e..c5fe8217 100644 --- a/configs/config_mb_2024_0_2__3_mux_2024_4roles.py +++ b/configs/config_mb_2024_0_2__3_mux_2024_4roles.py @@ -73,7 +73,7 @@ HARDWARE_CONFIG = { # Execution logging configuration EXEC_LOGGING_CONFIG = { 'logging_level': logging.INFO, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'logging_to_console': True, 'file_name': f'exec{logging_suffix}.log', 'max_bytes': 262144, @@ -97,7 +97,7 @@ DATA_LOGGING_CONFIG = { SOH_LOGGING_CONFIG = { 'logging_level': logging.INFO, 'logging_to_console': True, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'file_name': f'soh{logging_suffix}.log', 'max_bytes': 16777216, 'backup_count': 1024, @@ -119,7 +119,7 @@ MQTT_LOGGING_CONFIG = { 'transport': 'tcp', 'client_id': f'{OHMPI_CONFIG["id"]}', 'exec_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/exec', - 'exec_logging_level': logging.DEBUG, + 'exec_logging_level': EXEC_LOGGING_CONFIG['logging_level'], 'data_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/data', 'data_logging_level': DATA_LOGGING_CONFIG['logging_level'], 'soh_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/soh', diff --git a/configs/config_mb_2024_0_2__3_mux_2024_4roles_dps5005.py b/configs/config_mb_2024_0_2__3_mux_2024_4roles_dps5005.py index bf36420f..cc0eb8d0 100644 --- a/configs/config_mb_2024_0_2__3_mux_2024_4roles_dps5005.py +++ b/configs/config_mb_2024_0_2__3_mux_2024_4roles_dps5005.py @@ -73,7 +73,7 @@ HARDWARE_CONFIG = { # Execution logging configuration EXEC_LOGGING_CONFIG = { 'logging_level': logging.INFO, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'logging_to_console': True, 'file_name': f'exec{logging_suffix}.log', 'max_bytes': 262144, @@ -97,7 +97,7 @@ DATA_LOGGING_CONFIG = { SOH_LOGGING_CONFIG = { 'logging_level': logging.INFO, 'logging_to_console': True, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'file_name': f'soh{logging_suffix}.log', 'max_bytes': 16777216, 'backup_count': 1024, @@ -119,7 +119,7 @@ MQTT_LOGGING_CONFIG = { 'transport': 'tcp', 'client_id': f'{OHMPI_CONFIG["id"]}', 'exec_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/exec', - 'exec_logging_level': logging.DEBUG, + 'exec_logging_level': EXEC_LOGGING_CONFIG['logging_level'], 'data_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/data', 'data_logging_level': DATA_LOGGING_CONFIG['logging_level'], 'soh_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/soh', diff --git a/configs/config_mb_2024_0_2__4_mux_2023.py b/configs/config_mb_2024_0_2__4_mux_2023.py index 9d226ec5..111b8cb9 100644 --- a/configs/config_mb_2024_0_2__4_mux_2023.py +++ b/configs/config_mb_2024_0_2__4_mux_2023.py @@ -73,7 +73,7 @@ HARDWARE_CONFIG = { # Execution logging configuration EXEC_LOGGING_CONFIG = { 'logging_level': logging.INFO, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'logging_to_console': True, 'file_name': f'exec{logging_suffix}.log', 'max_bytes': 262144, @@ -97,7 +97,7 @@ DATA_LOGGING_CONFIG = { SOH_LOGGING_CONFIG = { 'logging_level': logging.INFO, 'logging_to_console': True, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'file_name': f'soh{logging_suffix}.log', 'max_bytes': 16777216, 'backup_count': 1024, @@ -119,7 +119,7 @@ MQTT_LOGGING_CONFIG = { 'transport': 'tcp', 'client_id': f'{OHMPI_CONFIG["id"]}', 'exec_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/exec', - 'exec_logging_level': logging.DEBUG, + 'exec_logging_level': EXEC_LOGGING_CONFIG['logging_level'], 'data_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/data', 'data_logging_level': DATA_LOGGING_CONFIG['logging_level'], 'soh_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/soh', diff --git a/configs/config_mb_2024_0_2__4_mux_2023_dps5005.py b/configs/config_mb_2024_0_2__4_mux_2023_dps5005.py index f4117794..21c2850a 100644 --- a/configs/config_mb_2024_0_2__4_mux_2023_dps5005.py +++ b/configs/config_mb_2024_0_2__4_mux_2023_dps5005.py @@ -73,7 +73,7 @@ HARDWARE_CONFIG = { # Execution logging configuration EXEC_LOGGING_CONFIG = { 'logging_level': logging.INFO, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'logging_to_console': True, 'file_name': f'exec{logging_suffix}.log', 'max_bytes': 262144, @@ -97,7 +97,7 @@ DATA_LOGGING_CONFIG = { SOH_LOGGING_CONFIG = { 'logging_level': logging.INFO, 'logging_to_console': True, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'file_name': f'soh{logging_suffix}.log', 'max_bytes': 16777216, 'backup_count': 1024, @@ -119,7 +119,7 @@ MQTT_LOGGING_CONFIG = { 'transport': 'tcp', 'client_id': f'{OHMPI_CONFIG["id"]}', 'exec_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/exec', - 'exec_logging_level': logging.DEBUG, + 'exec_logging_level': EXEC_LOGGING_CONFIG['logging_level'], 'data_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/data', 'data_logging_level': DATA_LOGGING_CONFIG['logging_level'], 'soh_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/soh', diff --git a/configs/config_mb_2024_0_2__4_mux_2024_2roles.py b/configs/config_mb_2024_0_2__4_mux_2024_2roles.py index 95810760..a28af99e 100644 --- a/configs/config_mb_2024_0_2__4_mux_2024_2roles.py +++ b/configs/config_mb_2024_0_2__4_mux_2024_2roles.py @@ -84,7 +84,7 @@ HARDWARE_CONFIG = { # Execution logging configuration EXEC_LOGGING_CONFIG = { 'logging_level': logging.INFO, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'logging_to_console': True, 'file_name': f'exec{logging_suffix}.log', 'max_bytes': 262144, @@ -108,7 +108,7 @@ DATA_LOGGING_CONFIG = { SOH_LOGGING_CONFIG = { 'logging_level': logging.INFO, 'logging_to_console': True, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'file_name': f'soh{logging_suffix}.log', 'max_bytes': 16777216, 'backup_count': 1024, @@ -130,7 +130,7 @@ MQTT_LOGGING_CONFIG = { 'transport': 'tcp', 'client_id': f'{OHMPI_CONFIG["id"]}', 'exec_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/exec', - 'exec_logging_level': logging.DEBUG, + 'exec_logging_level': EXEC_LOGGING_CONFIG['logging_level'], 'data_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/data', 'data_logging_level': DATA_LOGGING_CONFIG['logging_level'], 'soh_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/soh', diff --git a/configs/config_mb_2024_0_2__4_mux_2024_2roles_dps5005.py b/configs/config_mb_2024_0_2__4_mux_2024_2roles_dps5005.py index 59d2c78f..e35e9f85 100644 --- a/configs/config_mb_2024_0_2__4_mux_2024_2roles_dps5005.py +++ b/configs/config_mb_2024_0_2__4_mux_2024_2roles_dps5005.py @@ -84,7 +84,7 @@ HARDWARE_CONFIG = { # Execution logging configuration EXEC_LOGGING_CONFIG = { 'logging_level': logging.INFO, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'logging_to_console': True, 'file_name': f'exec{logging_suffix}.log', 'max_bytes': 262144, @@ -108,7 +108,7 @@ DATA_LOGGING_CONFIG = { SOH_LOGGING_CONFIG = { 'logging_level': logging.INFO, 'logging_to_console': True, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'file_name': f'soh{logging_suffix}.log', 'max_bytes': 16777216, 'backup_count': 1024, @@ -130,7 +130,7 @@ MQTT_LOGGING_CONFIG = { 'transport': 'tcp', 'client_id': f'{OHMPI_CONFIG["id"]}', 'exec_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/exec', - 'exec_logging_level': logging.DEBUG, + 'exec_logging_level': EXEC_LOGGING_CONFIG['logging_level'], 'data_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/data', 'data_logging_level': DATA_LOGGING_CONFIG['logging_level'], 'soh_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/soh', diff --git a/configs/config_mb_2024_0_2__4_mux_2024_4roles.py b/configs/config_mb_2024_0_2__4_mux_2024_4roles.py index e2610c36..a220a1d9 100644 --- a/configs/config_mb_2024_0_2__4_mux_2024_4roles.py +++ b/configs/config_mb_2024_0_2__4_mux_2024_4roles.py @@ -81,7 +81,7 @@ HARDWARE_CONFIG = { # Execution logging configuration EXEC_LOGGING_CONFIG = { 'logging_level': logging.INFO, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'logging_to_console': True, 'file_name': f'exec{logging_suffix}.log', 'max_bytes': 262144, @@ -105,7 +105,7 @@ DATA_LOGGING_CONFIG = { SOH_LOGGING_CONFIG = { 'logging_level': logging.INFO, 'logging_to_console': True, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'file_name': f'soh{logging_suffix}.log', 'max_bytes': 16777216, 'backup_count': 1024, @@ -127,7 +127,7 @@ MQTT_LOGGING_CONFIG = { 'transport': 'tcp', 'client_id': f'{OHMPI_CONFIG["id"]}', 'exec_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/exec', - 'exec_logging_level': logging.DEBUG, + 'exec_logging_level': EXEC_LOGGING_CONFIG['logging_level'], 'data_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/data', 'data_logging_level': DATA_LOGGING_CONFIG['logging_level'], 'soh_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/soh', diff --git a/configs/config_mb_2024_0_2__4_mux_2024_4roles_dps5005.py b/configs/config_mb_2024_0_2__4_mux_2024_4roles_dps5005.py index 0e152d39..d9163f3b 100644 --- a/configs/config_mb_2024_0_2__4_mux_2024_4roles_dps5005.py +++ b/configs/config_mb_2024_0_2__4_mux_2024_4roles_dps5005.py @@ -81,7 +81,7 @@ HARDWARE_CONFIG = { # Execution logging configuration EXEC_LOGGING_CONFIG = { 'logging_level': logging.INFO, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'logging_to_console': True, 'file_name': f'exec{logging_suffix}.log', 'max_bytes': 262144, @@ -105,7 +105,7 @@ DATA_LOGGING_CONFIG = { SOH_LOGGING_CONFIG = { 'logging_level': logging.INFO, 'logging_to_console': True, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'file_name': f'soh{logging_suffix}.log', 'max_bytes': 16777216, 'backup_count': 1024, @@ -127,7 +127,7 @@ MQTT_LOGGING_CONFIG = { 'transport': 'tcp', 'client_id': f'{OHMPI_CONFIG["id"]}', 'exec_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/exec', - 'exec_logging_level': logging.DEBUG, + 'exec_logging_level': EXEC_LOGGING_CONFIG['logging_level'], 'data_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/data', 'data_logging_level': DATA_LOGGING_CONFIG['logging_level'], 'soh_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/soh', diff --git a/configs/config_mb_2024_0_2_dps5005.py b/configs/config_mb_2024_0_2_dps5005.py index 53975cc4..20b32ca9 100644 --- a/configs/config_mb_2024_0_2_dps5005.py +++ b/configs/config_mb_2024_0_2_dps5005.py @@ -46,7 +46,7 @@ HARDWARE_CONFIG = { # Execution logging configuration EXEC_LOGGING_CONFIG = { 'logging_level': logging.INFO, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'logging_to_console': True, 'file_name': f'exec{logging_suffix}.log', 'max_bytes': 262144, @@ -70,7 +70,7 @@ DATA_LOGGING_CONFIG = { SOH_LOGGING_CONFIG = { 'logging_level': logging.INFO, 'logging_to_console': True, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'file_name': f'soh{logging_suffix}.log', 'max_bytes': 16777216, 'backup_count': 1024, @@ -92,7 +92,7 @@ MQTT_LOGGING_CONFIG = { 'transport': 'tcp', 'client_id': f'{OHMPI_CONFIG["id"]}', 'exec_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/exec', - 'exec_logging_level': logging.DEBUG, + 'exec_logging_level': EXEC_LOGGING_CONFIG['logging_level'], 'data_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/data', 'data_logging_level': DATA_LOGGING_CONFIG['logging_level'], 'soh_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/soh', diff --git a/ohmpi/hardware_components/pwr_dps5005.py b/ohmpi/hardware_components/pwr_dps5005.py index 4ec2f292..19483783 100644 --- a/ohmpi/hardware_components/pwr_dps5005.py +++ b/ohmpi/hardware_components/pwr_dps5005.py @@ -90,8 +90,10 @@ class Pwr(PwrAbstract): self.connection.write_register(0x09, 1) self.current_max(self._current_max) self._pwr_state = 'on' + self.exec_logger.event(f'{self.model}\tpwr_latency\tbegin\t{datetime.datetime.utcnow()}') self.exec_logger.debug(f'{self.model} is on') time.sleep(self._pwr_latency) + self.exec_logger.event(f'{self.model}\tpwr_latency\tend\t{datetime.datetime.utcnow()}') elif state == 'off': self.connection.write_register(0x09, 0) diff --git a/ohmpi/hardware_system.py b/ohmpi/hardware_system.py index 7fd55425..0f636935 100644 --- a/ohmpi/hardware_system.py +++ b/ohmpi/hardware_system.py @@ -372,7 +372,7 @@ class OhmPiHardware: return sp def _find_vab(self, vab, iab, vmn, p_max, vab_max, iab_max, vmn_max, vmn_min): - self.exec_logger.debug('Searching best Vab...') + self.exec_logger.debug('Searching for the best Vab...') iab_mean = np.mean(iab) iab_std = np.std(iab) vmn_mean = np.mean(vmn) diff --git a/ohmpi/utils.py b/ohmpi/utils.py index 221411de..37a27334 100644 --- a/ohmpi/utils.py +++ b/ohmpi/utils.py @@ -345,7 +345,7 @@ HARDWARE_CONFIG = { # Execution logging configuration EXEC_LOGGING_CONFIG = { 'logging_level': logging.INFO, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'logging_to_console': True, 'file_name': f'exec{logging_suffix}.log', 'max_bytes': 262144, @@ -369,7 +369,7 @@ DATA_LOGGING_CONFIG = { SOH_LOGGING_CONFIG = { 'logging_level': logging.INFO, 'logging_to_console': True, - 'log_file_logging_level': logging.DEBUG, + 'log_file_logging_level': logging.INFO, 'file_name': f'soh{logging_suffix}.log', 'max_bytes': 16777216, 'backup_count': 1024, @@ -391,7 +391,7 @@ MQTT_LOGGING_CONFIG = { 'transport': 'tcp', 'client_id': f'{OHMPI_CONFIG["id"]}', 'exec_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/exec', - 'exec_logging_level': logging.DEBUG, + 'exec_logging_level': EXEC_LOGGING_CONFIG['logging_level'], 'data_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/data', 'data_logging_level': DATA_LOGGING_CONFIG['logging_level'], 'soh_topic': f'ohmpi_{OHMPI_CONFIG["id"]}/soh', -- GitLab