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

supervise-daemon: fix type of exiting flag

Browse Source
This commit is contained in:
William Hubbs 2018-11-28 16:06:07 -06:00
parent e96f7d5658
commit b7828651ba
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,6 +121,7 @@ const char *usagestring = NULL;
static int healthcheckdelay = 0; static int healthcheckdelay = 0;
static int healthchecktimer = 0; static int healthchecktimer = 0;
static volatile sig_atomic_t do_healthcheck = 0; static volatile sig_atomic_t do_healthcheck = 0;
static volatile sig_atomic_t exiting = 0;
static int nicelevel = 0; static int nicelevel = 0;
static int ionicec = -1; static int ionicec = -1;
static int ioniced = 0; static int ioniced = 0;
@ -133,7 +134,6 @@ static int stdout_fd;
static int stderr_fd; static int stderr_fd;
static char *redirect_stderr = NULL; static char *redirect_stderr = NULL;
static char *redirect_stdout = NULL; static char *redirect_stdout = NULL;
static bool exiting = false;
#ifdef TIOCNOTTY #ifdef TIOCNOTTY
static int tty_fd = -1; static int tty_fd = -1;
#endif #endif
@ -184,7 +184,7 @@ static void handle_signal(int sig)
syslog(LOG_WARNING, "caught signal %d", sig); syslog(LOG_WARNING, "caught signal %d", sig);
if (sig == SIGTERM) if (sig == SIGTERM)
exiting = true; exiting = 1;
/* Restore errno */ /* Restore errno */
errno = serrno; errno = serrno;
if (! exiting) if (! exiting)
@ -582,7 +582,7 @@ static void supervisor(char *exec, char **argv)
if (respawn_count > respawn_max) { if (respawn_count > respawn_max) {
syslog(LOG_WARNING, syslog(LOG_WARNING,
"respawned \"%s\" too many times, exiting", exec); "respawned \"%s\" too many times, exiting", exec);
exiting = true; exiting = 1;
continue; continue;
} }
} }