YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

adaptation for various actions

Browse source
This commit is contained in:
yalh76 2020-01-08 19:57:32 +01:00 • committed by GitHub
parent 3a65b42802
commit d35dcbe968
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/helpers.d/systemd
View file

@ -135,7 +135,7 @@ ynh_systemd_action() {
# Read the log until the sentence is found, that means the app finished to start. Or run until the timeout # Read the log until the sentence is found, that means the app finished to start. Or run until the timeout
if grep --quiet "$line_match" "$templog" if grep --quiet "$line_match" "$templog"
then then
ynh_print_info --message="The service $service_name has correctly started." ynh_print_info --message="The service $service_name has correctly executed the action ${action}."
break break
fi fi
if [ $i -eq 3 ]; then if [ $i -eq 3 ]; then
@ -151,7 +151,7 @@ ynh_systemd_action() {
fi fi
if [ $i -eq $timeout ] if [ $i -eq $timeout ]
then then
ynh_print_warn --message="The service $service_name didn't fully started before the timeout." ynh_print_warn --message="The service $service_name didn't fully executed the action ${action} before the timeout."
ynh_print_warn --message="Please find here an extract of the end of the log of the service $service_name:" ynh_print_warn --message="Please find here an extract of the end of the log of the service $service_name:"
journalctl --no-pager --lines=$length -u $service_name >&2 journalctl --no-pager --lines=$length -u $service_name >&2
test -e "$log_path" && echo "--" >&2 && tail --lines=$length "$log_path" >&2 test -e "$log_path" && echo "--" >&2 && tail --lines=$length "$log_path" >&2