From 223fa3ca1c03d74feb3f1f9a79f4a91251242bdc Mon Sep 17 00:00:00 2001
From: Thomas <51749973+Thovi98@users.noreply.github.com>
Date: Thu, 9 Mar 2023 13:38:15 +0100
Subject: [PATCH] more cleanup

---
 scripts/install |  6 +++---
 scripts/restore |  6 +++---
 scripts/upgrade | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/scripts/install b/scripts/install
index f251d6e..b35751d 100755
--- a/scripts/install
+++ b/scripts/install
@@ -92,7 +92,7 @@ ynh_add_systemd_config --service="${app}_workers" --template="fittrackee_workers
 # INTEGRATE SERVICE IN YUNOHOST
 ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-yunohost service add "${app}" --description="Fittrackee main service" --log="/var/log/$app/$app.log"
+yunohost service add "${app}" --description="Fittrackee main service" --log="/var/log/$app/$app.log" --log="/var/log/$app/gunicorn.log"
 yunohost service add "${app}_workers" --description="Fittrackee task queue service" --log="var/log/$app/${app}_workers.log"
 
 
@@ -108,8 +108,8 @@ yunohost service add "${app}_workers" --description="Fittrackee task queue servi
 ynh_script_progression --message="Starting the systemd services..." --weight=15
 
 # Start a systemd service
-ynh_systemd_action --service_name="${app}" --action="start"  --log_path="/var/log/$app/$app.log" --line_match="Booting worker with pid"
-ynh_systemd_action --service_name="${app}_workers" --action="start" --log_path="/var/log/$app/${app}_workers.log" --line_match="Started"
+ynh_systemd_action --service_name="${app}" --action="start"
+ynh_systemd_action --service_name="${app}_workers" --action="start"
 
 #=================================================
 # END OF SCRIPT
diff --git a/scripts/restore b/scripts/restore
index d083c44..458f492 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -67,7 +67,7 @@ systemctl enable "${app}_workers.service" --quiet
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-yunohost service add "${app}" --description="Fittrackee main service" --log="/var/log/$app/$app.log"
+yunohost service add "${app}" --description="Fittrackee main service" --log="/var/log/$app/$app.log" --log="/var/log/$app/gunicorn.log"
 yunohost service add "${app}_workers" --description="Fittrackee task queue service" --log="var/log/$app/${app}_workers.log"
 
 #=================================================
@@ -75,8 +75,8 @@ yunohost service add "${app}_workers" --description="Fittrackee task queue servi
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
-ynh_systemd_action --service_name="${app}" --action="start" --log_path="/var/log/$app/$app.log" --line_match="Booting worker with pid"
-ynh_systemd_action --service_name="${app}_workers" --action="start" --log_path="/var/log/$app/${app}_workers.log" --line_match="Started"
+ynh_systemd_action --service_name="${app}" --action="start" 
+ynh_systemd_action --service_name="${app}_workers" --action="start" 
 
 #=================================================
 # GENERIC FINALIZATION
diff --git a/scripts/upgrade b/scripts/upgrade
index 2d07913..2b0e323 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -28,8 +28,8 @@ upgrade_type=$(ynh_check_app_version_changed)
 #=================================================
 ynh_script_progression --message="Stopping a systemd service..." --weight=1
 
-ynh_systemd_action --action="stop" --service_name="${app}" --log_path="/var/log/$app/$app.log" --line_match="Stopped"
-ynh_systemd_action --action="stop" --service_name="${app}_workers" --log_path="/var/log/$app/${app}_workers.log" --line_match="Stopped"
+ynh_systemd_action --action="stop" --service_name="${app}" 
+ynh_systemd_action --action="stop" --service_name="${app}_workers"
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
@@ -89,7 +89,7 @@ ynh_add_systemd_config --service="${app}_workers" --template="fittrackee_workers
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-yunohost service add "${app}" --description="Fittrackee main service" --log="/var/log/$app/$app.log"
+yunohost service add "${app}" --description="Fittrackee main service" --log="/var/log/$app/$app.log" --log="/var/log/$app/gunicorn.log"
 yunohost service add "${app}_workers" --description="Fittrackee task queue service" --log="var/log/$app/${app}_workers.log"
 
 #=================================================
@@ -98,8 +98,8 @@ yunohost service add "${app}_workers" --description="Fittrackee task queue servi
 ynh_script_progression --message="Starting the systemd services..." --weight=15
 
 # Start a systemd service
-ynh_systemd_action --service_name="${app}" --action="start"  --log_path="/var/log/$app/$app.log" --line_match="Booting worker with pid"
-ynh_systemd_action --service_name="${app}_workers" --action="start" --log_path="/var/log/$app/${app}_workers.log" --line_match="Started"
+ynh_systemd_action --service_name="${app}" --action="start"  
+ynh_systemd_action --service_name="${app}_workers" --action="start" 
 
 #=================================================
 # END OF SCRIPT