From 088e31536ea4dc7f3a241f88c8ea1ff67cdf31f2 Mon Sep 17 00:00:00 2001
From: alex <alessandro.battilani@gmail.com>
Date: Sun, 22 Dec 2024 21:08:05 +0100
Subject: [PATCH] fix service logging

---
 control_mqtt.py                    | 4 +---
 password_wallet_api.py             | 5 +----
 services/mqtt_ase_receiver.service | 1 +
 services/password_wallet.service   | 1 +
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/control_mqtt.py b/control_mqtt.py
index 57b960e..4135927 100755
--- a/control_mqtt.py
+++ b/control_mqtt.py
@@ -102,7 +102,6 @@ def main():
     parser.add_argument('-u', '--username', default="admin")
     parser.add_argument('-w', '--wallet', default="http://localhost:5000/")
     parser.add_argument('-P', '--port', type=int, default=1883)
-    parser.add_argument('-l', '--log', default='/var/log/mosquitto/subscriber_manager.log')
     parser.add_argument('-L', '--log_level', choices=['DEBUG', 'INFO', 'WARNING', 'ERROR'], default='INFO')
     parser.add_argument('-s', '--dyn_sec_conf', default='./dynamic-security.json')
     parser.add_argument('-r', '--ase_receiver', default='./subscribe_ase_receiver.py')
@@ -111,8 +110,7 @@ def main():
 
     logging.basicConfig(
         format="%(asctime)s - PID: %(process)d %(levelname)8s: %(message)s ",
-        level=args.log_level,
-        filename=args.log
+        level=args.log_level
     )
 
     auth = {'username': args.username, 'password': get_credentials(args)}
diff --git a/password_wallet_api.py b/password_wallet_api.py
index 20c50e2..2ff292f 100644
--- a/password_wallet_api.py
+++ b/password_wallet_api.py
@@ -13,10 +13,7 @@ hash_file = "data/master_hash.txt"
 app = Flask(__name__)
 
 # Configura il logging
-logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s', handlers=[
-    logging.FileHandler("/var/log/mosquitto/password_wallet.log"),
-    logging.StreamHandler()
-])
+logging.basicConfig(level=logging.INFO, format='%(asctime)s - PID: %(process)d %(levelname)s - %(message)s')
 
 # Inizializza il database
 def init_db():
diff --git a/services/mqtt_ase_receiver.service b/services/mqtt_ase_receiver.service
index 4e759fa..85ed889 100644
--- a/services/mqtt_ase_receiver.service
+++ b/services/mqtt_ase_receiver.service
@@ -7,6 +7,7 @@ WorkingDirectory=/var/lib/mosquitto
 ExecStart=/var/lib/mosquitto/.venv/bin/python3 /var/lib/mosquitto/control_mqtt.py
 EnvironmentFile=/var/lib/mosquitto/data/.env
 Restart=always
+SyslogIdentifier=control_mqtt
 
 [Install]
 WantedBy=multi-user.target
diff --git a/services/password_wallet.service b/services/password_wallet.service
index 450716a..74b4c51 100644
--- a/services/password_wallet.service
+++ b/services/password_wallet.service
@@ -7,6 +7,7 @@ User=mosquitto
 WorkingDirectory=/var/lib/mosquitto
 ExecStart=/var/lib/mosquitto/.venv/bin/python3 /var/lib/mosquitto/password_wallet_api.py
 Restart=always
+SyslogIdentifier=password_wallet
 
 [Install]
 WantedBy=multi-user.target