emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

supervise-daemon: use RC_SVCNAME as the first argument to the daemon

Browse Source 
This makes ps show which service the supervisor is monitoring.
This commit is contained in:
William Hubbs 2017-10-27 19:22:09 -05:00
parent 3fe99c8b82
commit 913b2ca537
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sh/supervise-daemon.sh
View File

@ -22,7 +22,7 @@ supervise_start()
# The eval call is necessary for cases like: # The eval call is necessary for cases like:
# command_args="this \"is a\" test" # command_args="this \"is a\" test"
# to work properly. # to work properly.
eval supervise-daemon --start \ eval supervise-daemon "${RC_SVCNAME}" --start \
${retry:+--retry} $retry \ ${retry:+--retry} $retry \
${chroot:+--chroot} $chroot \ ${chroot:+--chroot} $chroot \
${pidfile:+--pidfile} $pidfile \ ${pidfile:+--pidfile} $pidfile \
@ -49,7 +49,7 @@ supervise_stop()
pidfile="${startpidfile:-$pidfile}" pidfile="${startpidfile:-$pidfile}"
[ -n "$pidfile" ] || return 0 [ -n "$pidfile" ] || return 0
ebegin "Stopping ${name:-$RC_SVCNAME}" ebegin "Stopping ${name:-$RC_SVCNAME}"
supervise-daemon --stop \ supervise-daemon "${RC_SVCNAME}" --stop \
${pidfile:+--pidfile} $chroot$pidfile \ ${pidfile:+--pidfile} $chroot$pidfile \
${stopsig:+--signal} $stopsig ${stopsig:+--signal} $stopsig

24
src/rc/supervise-daemon.c
View File

@ -561,8 +561,13 @@ int main(int argc, char **argv)
applet = basename_c(argv[0]); applet = basename_c(argv[0]);
atexit(cleanup); atexit(cleanup);
svcname = getenv("RC_SVCNAME"); svcname = getenv("RC_SVCNAME");
if (!svcname)
eerrorx("%s: The RC_SVCNAME environment variable is not set", applet);
openlog(applet, LOG_PID, LOG_DAEMON); openlog(applet, LOG_PID, LOG_DAEMON);
if (argc >= 1 && svcname && strcmp(argv[1], svcname))
eerrorx("%s: the first argument must be %s", applet, svcname);
if ((tmp = getenv("SSD_NICELEVEL"))) if ((tmp = getenv("SSD_NICELEVEL")))
if (sscanf(tmp, "%d", &nicelevel) != 1) if (sscanf(tmp, "%d", &nicelevel) != 1)
eerror("%s: invalid nice level `%s' (SSD_NICELEVEL)", eerror("%s: invalid nice level `%s' (SSD_NICELEVEL)",
@ -583,6 +588,17 @@ int main(int argc, char **argv)
} }
} }
*cmdline = '\0';
c = argv;
while (c && *c) {
strcat(cmdline, *c);
strcat(cmdline, " ");
c++;
}
if (svcname) {
argc--;
argv++;
}
while ((opt = getopt_long(argc, argv, getoptstring, longopts, while ((opt = getopt_long(argc, argv, getoptstring, longopts,
(int *) 0)) != -1) (int *) 0)) != -1)
switch (opt) { switch (opt) {
@ -721,14 +737,6 @@ int main(int argc, char **argv)
if (!pidfile && !reexec) if (!pidfile && !reexec)
eerrorx("%s: --pidfile must be specified", applet); eerrorx("%s: --pidfile must be specified", applet);
*cmdline = '\0';
c = argv;
while (c && *c) {
strcat(cmdline, *c);
strcat(cmdline, " ");
c++;
}
endpwent(); endpwent();
argc -= optind; argc -= optind;
argv += optind; argv += optind;