From dd3e2540999808f09d928175abb4adc0f61aa7a3 Mon Sep 17 00:00:00 2001
From: arnaud <arnaud.watlet@umons.ac.be>
Date: Wed, 26 Oct 2022 18:40:30 +0200
Subject: [PATCH] Changes default interface to http_interface.py
---
config.py | 12 ++++++------
logging_setup.py | 4 ++--
mqtt_logger.py | 3 +--
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/config.py b/config.py
index de61e9c5..70a16656 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 2dc30f81..ccd9f7af 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 02f1c041..c4979073 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 ?
--
GitLab