system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-14 12:23:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

daemon: decouple restart variable

Browse source 
The 'restart' variable was responsible for enablement of restart
behavior and for restart delay. While it may seem convenient it
leads to cluttering the exit/restart logic

Reviewed by:	kevans
Pull Request:	https://github.com/freebsd/freebsd-src/pull/672

(cherry picked from commit e781739084)
This commit is contained in:
Ihor Antonov 2023-03-02 23:17:02 -06:00 committed by Kyle Evans
parent 3f0b048a24
commit ec3a7d2828
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
usr.sbin/daemon/daemon.c
View file

@ -147,6 +147,7 @@ main(int argc, char *argv[])
bool supervision_enabled = false;
bool log_reopen = false;
bool child_eof = false;
bool restart_enabled = false;
char *p = NULL;
const char *child_pidfile = NULL;
const char *parent_pidfile = NULL;
@ -155,7 +156,7 @@ main(int argc, char *argv[])
int ch = 0;
int keep_cur_workdir = 1;
int pipe_fd[2] = { -1, -1 };
int restart = 0;
int restart_delay = 1;
int stdmask = STDOUT_FILENO | STDERR_FILENO;
struct log_params logparams = {
.syslog_enabled = false,
@ -213,11 +214,12 @@ main(int argc, char *argv[])
parent_pidfile = optarg;
break;
case 'r':
restart = 1;
restart_enabled = true;
break;
case 'R':
restart = strtol(optarg, &p, 0);
if (p == optarg || restart < 1) {
restart_enabled = true;
restart_delay = strtol(optarg, &p, 0);
if (p == optarg || restart_delay < 1) {
errx(6, "invalid restart delay");
}
break;
@ -303,8 +305,8 @@ main(int argc, char *argv[])
*/
supervision_enabled = child_pidfile != NULL ||
parent_pidfile != NULL ||
restart != 0 ||
logparams.output_fd != -1 ||
restart_enabled == true ||
logparams.output_fd != -1 ||
logparams.syslog_enabled == true;
if (supervision_enabled) {
@ -486,14 +488,14 @@ main(int argc, char *argv[])
}
}
if (restart && !terminate) {
daemon_sleep(restart, 0);
if (restart_enabled && !terminate) {
daemon_sleep(restart_delay, 0);
}
if (sigprocmask(SIG_BLOCK, &mask_term, NULL)) {
warn("sigprocmask");
goto exit;
}
if (restart && !terminate) {
if (restart_enabled && !terminate) {
close(pipe_fd[0]);
pipe_fd[0] = -1;
goto restart;