implement "unsupervised" status
The unsupervised status is to be used when a supervisor of a supervised service dies but leaves the service daemon itself running.
This commit is contained in:
parent
667a09983c
commit
82da844b42
@ -58,22 +58,11 @@ supervise_stop()
|
||||
|
||||
_check_supervised()
|
||||
{
|
||||
[ "$RC_UNAME" != Linux ] && return 0
|
||||
local child_pid="$(service_get_value "child_pid")"
|
||||
local pid="$(cat ${pidfile})"
|
||||
if [ -n "${child_pid}" ]; then
|
||||
if ! [ -e "/proc/${pid}" ] && [ -e "/proc/${child_pid}" ]; then
|
||||
if [ -e "/proc/self/ns/pid" ] && [ -e "/proc/${child_pid}/ns/pid" ]; then
|
||||
local n1 n2
|
||||
n1=$(readlink "/proc/self/ns/pid")
|
||||
n2=$(readlink "/proc/${child_pid}/ns/pid")
|
||||
if [ "${n1}" = "${n2}" ]; then
|
||||
return 1
|
||||
fi
|
||||
else
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
local child_pid start_time
|
||||
child_pid="$(service_get_value "child_pid")"
|
||||
start_time="$(service_get_value "start_time")"
|
||||
if [ -n "${child_pid}" ] && [ -n "${start_time}" ]; then
|
||||
return 1
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
@ -128,6 +128,8 @@ print_service(const char *service)
|
||||
{
|
||||
char status[60];
|
||||
char uptime [40];
|
||||
char *child_pid = NULL;
|
||||
char *start_time = NULL;
|
||||
int cols = printf(" %s", service);
|
||||
const char *c = ecolor(ECOLOR_GOOD);
|
||||
RC_SERVICE state = rc_service_state(service);
|
||||
@ -147,7 +149,14 @@ print_service(const char *service)
|
||||
rc_service_daemons_crashed(service) &&
|
||||
errno != EACCES)
|
||||
{
|
||||
snprintf(status, sizeof(status), " crashed ");
|
||||
child_pid = rc_service_value_get(service, "child_pid");
|
||||
start_time = rc_service_value_get(service, "start_time");
|
||||
if (start_time && child_pid)
|
||||
snprintf(status, sizeof(status), " unsupervised ");
|
||||
else
|
||||
snprintf(status, sizeof(status), " crashed ");
|
||||
free(child_pid);
|
||||
free(start_time);
|
||||
} else {
|
||||
get_uptime(service, uptime, 40);
|
||||
snprintf(status, sizeof(status), " started %s", uptime);
|
||||
|
Loading…
Reference in New Issue
Block a user