From 025bbedd4aafb5ec63447f55d9ecf68137ac6edb Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Tue, 31 Mar 2020 17:42:55 +0200
Subject: [PATCH] switch logs to systemd

---
 scripts/backup  | 12 ++++++------
 scripts/install | 15 ++++++---------
 scripts/remove  |  7 -------
 scripts/restore | 12 ++++++------
 scripts/upgrade | 14 ++++++--------
 5 files changed, 24 insertions(+), 36 deletions(-)

diff --git a/scripts/backup b/scripts/backup
index 262902f..64062e8 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -38,9 +38,9 @@ domain=$(ynh_app_setting_get --app=$app --key=domain)
 #=================================================
 ynh_print_info --message="Stopping a systemd service..."
 
-ynh_systemd_action --service_name=$app-videobridge --action="stop" --log_path="/var/log/$app/$app-videobridge.log"
-ynh_systemd_action --service_name=$app-jicofo --action="stop" --log_path="/var/log/$app/$app-jicofo.log"
-ynh_systemd_action --service_name=$app-coturn --action="stop" --log_path="/var/log/$app/$app-coturn.log"
+ynh_systemd_action --service_name=$app-videobridge --action="stop" --log_path="systemd" --line_match="Stopped $app-videobridge"
+ynh_systemd_action --service_name=$app-jicofo --action="stop" --log_path="systemd" --line_match="Stopped $app-jicofo"
+ynh_systemd_action --service_name=$app-coturn --action="stop" --log_path="systemd" --line_match="Stopped coturn"
 
 #=================================================
 # BACKUP THE APP MAIN DIR
@@ -111,9 +111,9 @@ ynh_backup --src_path="/etc/systemd/system/$app-coturn.service"
 #=================================================
 ynh_print_info --message="Starting a systemd service..."
 
-ynh_systemd_action --service_name=$app-videobridge --action="start" --log_path="/var/log/$app/$app-videobridge.log"
-ynh_systemd_action --service_name=$app-jicofo --action="start" --log_path="/var/log/$app/$app-jicofo.log"
-ynh_systemd_action --service_name=$app-coturn --action="start" --log_path="/var/log/$app/$app-coturn.log"
+ynh_systemd_action --service_name=$app-videobridge --action="start" --log_path="systemd" --line_match="Started $app-videobridge"
+ynh_systemd_action --service_name=$app-jicofo --action="start" --log_path="systemd" --line_match="Started $app-jicofo"
+ynh_systemd_action --service_name=$app-coturn --action="start" --log_path="systemd" --line_match="Started coturn"
 
 #=================================================
 # END OF SCRIPT
diff --git a/scripts/install b/scripts/install
index a603870..3b1e1c4 100644
--- a/scripts/install
+++ b/scripts/install
@@ -185,8 +185,6 @@ fi
 
 ynh_store_file_checksum --file="$coturn_config"
 
-mkdir -p /var/log/$app
-
 #=================================================
 # CONFIGURE METRONOME
 #=================================================
@@ -318,7 +316,6 @@ ynh_print_info --message="Securing files and directories..."
 
 # Set permissions to app files
 chown -R $app: $final_path
-chown -R $app: /var/log/$app
 
 #=================================================
 # SETUP LOGROTATE
@@ -333,9 +330,9 @@ ynh_use_logrotate
 #=================================================
 ynh_print_info --message="Integrating service in YunoHost..."
 
-yunohost service add $app-videobridge --description "$app jitsi-videobridge for jitsi" --log "/var/log/$app/$app-videobridge.log"
-yunohost service add $app-jicofo --description "$app jitsi-jicofo for jitsi" --log "/var/log/$app/$app-jicofo.log"
-yunohost service add $app-coturn --description "$app jitsi-coturn for jitsi" --log "/var/log/$app/$app-coturn.log"
+yunohost service add $app-videobridge --description "$app jitsi-videobridge for jitsi" --log_type "systemd"
+yunohost service add $app-jicofo --description "$app jitsi-jicofo for jitsi"  --log_type "systemd"
+yunohost service add $app-coturn --description "$app jitsi-coturn for jitsi"  --log_type "systemd"
 
 #=================================================
 # START SYSTEMD SERVICE
@@ -343,9 +340,9 @@ yunohost service add $app-coturn --description "$app jitsi-coturn for jitsi" --l
 ynh_print_info --message="Starting a systemd service..."
 
 # Start a systemd service
-ynh_systemd_action --service_name=$app-videobridge --action="start" --log_path="/var/log/$app/$app-videobridge.log"
-ynh_systemd_action --service_name=$app-jicofo --action="start" --log_path="/var/log/$app/$app-jicofo.log"
-ynh_systemd_action --service_name=$app-coturn --action="start" --log_path="/var/log/$app/$app-coturn.log"
+ynh_systemd_action --service_name=$app-videobridge --action="start" --log_path="systemd" --line_match="Started $app-videobridge"
+ynh_systemd_action --service_name=$app-jicofo --action="start" --log_path="systemd" --line_match="Started $app-jicofo"
+ynh_systemd_action --service_name=$app-coturn --action="start" --log_path="systemd" --line_match="Started coturn"
 
 #=================================================
 # SETUP SSOWAT
diff --git a/scripts/remove b/scripts/remove
index 83f6d4b..fd7d8d7 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -166,13 +166,6 @@ if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
 	yunohost domain remove coturn.$domain
 fi
 
-#=================================================
-# REMOVE THE LOG FILES
-#=================================================
-
-# Remove the log files
-ynh_secure_remove --file="/var/log/$app"
-
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 1205fd5..817ca00 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -164,18 +164,18 @@ systemctl enable $app-coturn.service
 #=================================================
 ynh_print_info --message="Integrating service in YunoHost..."
 
-yunohost service add $app-videobridge --log "/var/log/$app/$app-videobridge.log"
-yunohost service add $app-jicofo --log "/var/log/$app/$app-jicofo.log"
-yunohost service add $app-coturn --log "/var/log/$app/$app-coturn.log"
+yunohost service add $app-videobridge --log_type "systemd"
+yunohost service add $app-jicofo --log_type "systemd"
+yunohost service add $app-coturn --log_type "systemd"
 
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
 ynh_print_info --message="Starting a systemd service..."
 
-ynh_systemd_action --service_name=$app-videobridge --action="start" --log_path="/var/log/$app/$app-videobridge.log"
-ynh_systemd_action --service_name=$app-jicofo --action="start" --log_path="/var/log/$app/$app-jicofo.log"
-ynh_systemd_action --service_name=$app-coturn --action="start" --log_path="/var/log/$app/$app-coturn.log"
+ynh_systemd_action --service_name=$app-videobridge --action="start" --log_path="systemd" --line_match="Started $app-videobridge"
+ynh_systemd_action --service_name=$app-jicofo --action="start" --log_path="systemd" --line_match="Started $app-jicofo"
+ynh_systemd_action --service_name=$app-coturn --action="start" --log_path="systemd" --line_match="Started coturn"
 
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 685f795..958c520 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -96,9 +96,9 @@ ynh_abort_if_errors
 #=================================================
 ynh_print_info --message="Stopping a systemd service..."
 
-ynh_systemd_action --service_name=$app-videobridge --action="stop" --log_path="/var/log/$app/$app-videobridge.log"
-ynh_systemd_action --service_name=$app-jicofo --action="stop" --log_path="/var/log/$app/$app-jicofo.log"
-ynh_systemd_action --service_name=$app-coturn --action="stop" --log_path="/var/log/$app/$app-coturn.log"
+ynh_systemd_action --service_name=$app-videobridge --action="stop" --log_path="systemd" --line_match="Stopped $app-videobridge"
+ynh_systemd_action --service_name=$app-jicofo --action="stop" --log_path="systemd" --line_match="Stopped $app-jicofo"
+ynh_systemd_action --service_name=$app-coturn --action="stop" --log_path="systemd" --line_match="Stopped coturn"
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
@@ -180,8 +180,6 @@ fi
 
 ynh_store_file_checksum --file="$coturn_config"
 
-mkdir -p /var/log/$app
-
 #=================================================
 # BUILD JITSI-VIDEOBRIDGE
 #=================================================
@@ -292,9 +290,9 @@ ynh_app_setting_set --app=$app --key=unprotected_uris --value="/"
 #=================================================
 ynh_print_info --message="Starting a systemd service..."
 
-ynh_systemd_action --service_name=$app-videobridge --action="start" --log_path="/var/log/$app/$app-videobridge.log"
-ynh_systemd_action --service_name=$app-jicofo --action="start" --log_path="/var/log/$app/$app-jicofo.log"
-ynh_systemd_action --service_name=$app-coturn --action="start" --log_path="/var/log/$app/$app-coturn.log"
+ynh_systemd_action --service_name=$app-videobridge --action="start" --log_path="systemd" --line_match="Started $app-videobridge"
+ynh_systemd_action --service_name=$app-jicofo --action="start" --log_path="systemd" --line_match="Started $app-jicofo"
+ynh_systemd_action --service_name=$app-coturn --action="start" --log_path="systemd" --line_match="Started coturn"
 
 #=================================================
 # RELOAD NGINX