R
/
ssm
forked from Spark/ssm
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Another oops 

Signed-off-by: fbt <fbt@fleshless.org>
This commit is contained in:
Jack L. Frost 2018-01-07 08:56:33 +03:00
parent 08b7d5631d
commit 3c6fb9796b
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ssm
View File

@ -26,11 +26,10 @@ svc() {
declare job_pid declare job_pid
svc::cleanup() { svc::cleanup() {
kill -n "$service_stop_signal" "$job_pid" "${service_command_stop[@]}"
pid_wait "$job_pid" && { pid_wait "$job_pid"
rm -f "$svc_pidfile" "$service_ready_flag" rm -f "$svc_pidfile" "$service_ready_flag"
}
}; trap 'svc::cleanup' TERM }; trap 'svc::cleanup' TERM
"$@" & job_pid=$! "$@" & job_pid=$!
@ -281,7 +280,11 @@ stop() {
else else
(( service_running )) || return 3 (( service_running )) || return 3
"${service_command_stop[@]}" || return 1 if (( service_managed )); then
nullexec kill "$service_pid" || return 1
else
"${service_command_stop[@]}" || return 1
fi
pid_wait "$service_pid" || return 5 pid_wait "$service_pid" || return 5
> "$service_stopped_flag" > "$service_stopped_flag"
@ -425,16 +428,18 @@ main() {
} }
done done
# Search for a systemd service too [[ $service_config ]] || {
for i in {/etc/systemd,/run/systemd,/lib/systemd,/usr/lib/systemd}/system/$1.service; do # Search for a systemd service too
[[ -f "$i" ]] && { for i in {/etc/systemd,/run/systemd,/lib/systemd,/usr/lib/systemd}/system/$1.service; do
service_name=$1 [[ -f "$i" ]] && {
service_systemd=1 service_name=$1
service_config=$i service_systemd=1
read_systemd_service "$i" service_config=$i
break read_systemd_service "$i"
} break
done }
done
}
fi fi
# Die if there is no service config file # Die if there is no service config file