From f279e6e98634df19bc6cdbf780a47d96455dda48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Sat, 10 Feb 2018 19:10:17 +0100 Subject: [PATCH] Fix ynh_check_starting --- scripts/experimental_helper.sh | 5 +++-- scripts/install | 1 - scripts/restore | 1 - scripts/upgrade | 1 - 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/experimental_helper.sh b/scripts/experimental_helper.sh index 3b82ce4..600a653 100644 --- a/scripts/experimental_helper.sh +++ b/scripts/experimental_helper.sh @@ -31,12 +31,13 @@ ynh_check_starting () { } echo "Starting of $service_name" >&2 - systemctl restart $service_name + systemctl stop $service_name local templog="$(mktemp)" # Following the starting of the app in its log - tail -F -n1 "$app_log" > "$templog" & + tail -F -n0 "$app_log" > "$templog" & # Get the PID of the tail command local pid_tail=$! + systemctl start $service_name local i=0 for i in `seq 1 $timeout` diff --git a/scripts/install b/scripts/install index bf80bd4..0f474c6 100644 --- a/scripts/install +++ b/scripts/install @@ -105,4 +105,3 @@ ynh_use_logrotate "/var/log/$app" # Reload services ynh_check_starting "INFO] Listen: http://0.0.0.0:" "/var/log/$app/gogs.log" -sleep 1 diff --git a/scripts/restore b/scripts/restore index 6912b66..3ea6635 100644 --- a/scripts/restore +++ b/scripts/restore @@ -64,4 +64,3 @@ yunohost service add "$app" --log /var/log/"$app"/"$app".log # Reload services systemctl reload nginx.service ynh_check_starting "INFO] Listen: http://0.0.0.0:" "/var/log/$app/gogs.log" -sleep 1 \ No newline at end of file diff --git a/scripts/upgrade b/scripts/upgrade index 4e55ace..260e566 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -108,4 +108,3 @@ set_permission # Reload services ynh_check_starting "INFO] Listen: http://0.0.0.0:" "/var/log/$app/gogs.log" -sleep 1 \ No newline at end of file