From 0b2e46aa50c155088a518741572d1808672c9c91 Mon Sep 17 00:00:00 2001
From: Kay0u <pierre@kayou.io>
Date: Mon, 1 Mar 2021 14:34:03 +0100
Subject: [PATCH] fix line_match

---
 conf/systemd.service | 2 --
 scripts/change_url   | 2 +-
 scripts/install      | 2 +-
 scripts/restore      | 3 ++-
 scripts/upgrade      | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/conf/systemd.service b/conf/systemd.service
index 16142ad..6e2c583 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -10,8 +10,6 @@ WorkingDirectory=__FINALPATH__/
 ExecStart=/usr/bin/java -jar -Xmx1g app.jar --server.port=__PORT__ --server.servlet.context-path="__PATH__/"
 Restart=on-failure
 RestartSec=10
-StandardOutput=null
-StandardError=syslog
 
 [Install]
 WantedBy=multi-user.target
diff --git a/scripts/change_url b/scripts/change_url
index 6851d0c..20c8fc5 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -108,7 +108,7 @@ fi
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=5
 
-ynh_systemd_action --service_name=$app --action=start --log_path="systemd" --line_match="Started Komga server"
+ynh_systemd_action --service_name=$app --action=start --log_path="systemd" --line_match="Tomcat started on port\(s\): $port \(http\) with context path '$path_url'"
 
 #=================================================
 # RELOAD NGINX
diff --git a/scripts/install b/scripts/install
index 1a1f004..682881c 100755
--- a/scripts/install
+++ b/scripts/install
@@ -146,7 +146,7 @@ yunohost service add $app --description="Media server for your comics, manga and
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
 # Start a systemd service
-ynh_systemd_action --service_name=$app --action=start --log_path="systemd" --line_match="Started Komga server"
+ynh_systemd_action --service_name=$app --action=start --log_path="systemd" --line_match="Tomcat started on port\(s\): $port \(http\) with context path '$path_url'"
 
 #=================================================
 # SETUP SSOWAT
diff --git a/scripts/restore b/scripts/restore
index fff50a6..5c4fdc8 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -31,6 +31,7 @@ app=$YNH_APP_INSTANCE_NAME
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+port=$(ynh_app_setting_get --app=$app --key=port)
 
 #=================================================
 # CHECK IF THE APP CAN BE RESTORED
@@ -110,7 +111,7 @@ yunohost service add $app --description="Media server for your comics, manga and
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=3
 
-ynh_systemd_action --service_name=$app --action=start --log_path="systemd" --line_match="Started Komga server"
+ynh_systemd_action --service_name=$app --action=start --log_path="systemd" --line_match="Tomcat started on port\(s\): $port \(http\) with context path '$path_url'"
 
 #=================================================
 # RESTORE THE LOGROTATE CONFIGURATION
diff --git a/scripts/upgrade b/scripts/upgrade
index 946d0ab..7557524 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -132,7 +132,7 @@ yunohost service add $app --description="Media server for your comics, manga and
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=2
 
-ynh_systemd_action --service_name=$app --action=start --log_path="systemd" --line_match="Started Komga server"
+ynh_systemd_action --service_name=$app --action=start --log_path="systemd" --line_match="Tomcat started on port\(s\): $port \(http\) with context path '$path_url'"
 
 #=================================================
 # RELOAD NGINX