aboutsummaryrefslogtreecommitdiff
path: root/src/rc
diff options
context:
space:
mode:
authorWilliam Hubbs <w.d.hubbs@gmail.com>2018-12-02 15:15:51 -0600
committerWilliam Hubbs <w.d.hubbs@gmail.com>2018-12-03 12:41:29 -0600
commitaf70862a7a115d6269affca663423e9340d6e929 (patch)
tree8a2f9b8124455ee4a7f21bc16ca06d01871854b6 /src/rc
parentfa6611b5af94548e901e587fcd36f4fb59124975 (diff)
supervise-daemon: use a default pid file if one is not specified
Since the pid file is internal to us, start moving toward deprecating it by not requiring the user to specify it. In the next release, I plan on working on code to start phasing out the use of a pid file if this is possible.
Diffstat (limited to 'src/rc')
-rw-r--r--src/rc/supervise-daemon.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/rc/supervise-daemon.c b/src/rc/supervise-daemon.c
index c2082100..e7c578b8 100644
--- a/src/rc/supervise-daemon.c
+++ b/src/rc/supervise-daemon.c
@@ -779,7 +779,7 @@ int main(int argc, char **argv)
break;
case 'p': /* --pidfile <pid-file> */
- ewarn("%s: --pidfile is deprecated and will be removed", applet);
+ pidfile = optarg;
break;
case 'R': /* --retry <schedule>|timeout */
@@ -855,7 +855,8 @@ int main(int argc, char **argv)
ch_root = expand_home(home, ch_root);
umask(numask);
- xasprintf(&pidfile, "/var/run/supervise-%s.pid", svcname);
+ if (!pidfile)
+ xasprintf(&pidfile, "/var/run/supervise-%s.pid", svcname);
xasprintf(&fifopath, "%s/supervise-%s.ctl", RC_SVCDIR, svcname);
if (mkfifo(fifopath, 0600) == -1 && errno != EEXIST)
eerrorx("%s: unable to create control fifo: %s",
@@ -878,6 +879,7 @@ int main(int argc, char **argv)
sscanf(str, "%d", &child_pid);
free(str);
exec = rc_service_value_get(svcname, "exec");
+ pidfile = rc_service_value_get(svcname, "pidfile");
retry = rc_service_value_get(svcname, "retry");
if (retry) {
parse_schedule(applet, retry, sig);
@@ -959,6 +961,7 @@ int main(int argc, char **argv)
eerrorx("%s: fopen `%s': %s", applet, pidfile, strerror(errno));
fclose(fp);
+ rc_service_value_set(svcname, "pidfile", pidfile);
varbuf = NULL;
xasprintf(&varbuf, "%i", respawn_delay);
rc_service_value_set(svcname, "respawn_delay", varbuf);