From 0121ff40fead2965756d8d565c96d5eaaeb6d3b5 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sat, 24 Apr 2021 10:49:04 +0200 Subject: [PATCH] Reduce line_match timeout Service startup is usually quite fast and YNH tends to start monitoring the logs too late --- scripts/change_url | 4 ++-- scripts/install | 6 +++--- scripts/restore | 2 +- scripts/upgrade | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index 6012a83..b802be2 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -72,7 +72,7 @@ fi #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=2 -ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" --line_match="Stopped Jellyfin Media Server" +ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" --line_match="Stopped Jellyfin Media Server" --timeout=15 #================================================= # MODIFY URL IN NGINX CONF @@ -127,7 +127,7 @@ fi #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=2 -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Startup complete" +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Startup complete" --timeout=15 #================================================= # RELOAD NGINX diff --git a/scripts/install b/scripts/install index d4c6121..cd63ee3 100644 --- a/scripts/install +++ b/scripts/install @@ -115,8 +115,8 @@ ynh_system_user_create --username=$app ynh_script_progression --message="Configuring the settings..." --weight=1 # Load services once to generate system.xml -ynh_systemd_action --service_name=$app --action="restart" --log_path="systemd" --line_match="Started Jellyfin Media Server" -ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" --line_match="Stopped Jellyfin Media Server" +ynh_systemd_action --service_name=$app --action="restart" --log_path="systemd" --line_match="Started Jellyfin Media Server" --timeout=15 +ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" --line_match="Stopped Jellyfin Media Server" --timeout=15 # Port config ynh_replace_string --match_string="8096" --replace_string="$port" --target_file="$config_path/network.xml" @@ -175,7 +175,7 @@ yunohost service add $app --description="Jellyfin media center" --log_type="syst 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 Jellyfin Media Server" +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Started Jellyfin Media Server" --timeout=15 #================================================= # SETUP SSOWAT diff --git a/scripts/restore b/scripts/restore index 7f3606d..8f44002 100644 --- a/scripts/restore +++ b/scripts/restore @@ -119,7 +119,7 @@ yunohost service add $app --description="Jellyfin media center" --log_type="syst #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="restart" --log_path="systemd" --line_match="Started Jellyfin Media Server" +ynh_systemd_action --service_name=$app --action="restart" --log_path="systemd" --line_match="Started Jellyfin Media Server" --timeout=15 #================================================= # RESTORE THE LOGROTATE CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index eb7410b..952154c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -80,7 +80,7 @@ ynh_abort_if_errors #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" --line_match="Stopped Jellyfin Media Server" +ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" --line_match="Stopped Jellyfin Media Server" --timeout=15 #================================================= # NGINX CONFIGURATION @@ -133,8 +133,8 @@ if [ -z "/etc/jellyfin/network.xml" ]; then ynh_backup_if_checksum_is_different --file="$config_path/system.xml" # Load services once to generate network.xml - ynh_systemd_action --service_name=$app --action="restart" --log_path="systemd" --line_match="Started Jellyfin Media Server" - ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" --line_match="Stopped Jellyfin Media Server" + ynh_systemd_action --service_name=$app --action="restart" --log_path="systemd" --line_match="Started Jellyfin Media Server" --timeout=15 + ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" --line_match="Stopped Jellyfin Media Server" --timeout=15 # Port config ynh_replace_string --match_string="8096" --replace_string="$port" --target_file="$config_path/network.xml" @@ -193,7 +193,7 @@ yunohost service add $app --description="Jellyfin media center" --log_type="syst #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Started Jellyfin Media Server" +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Started Jellyfin Media Server" --timeout=15 #================================================= # RELOAD NGINX