d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't touch pidfiles when running in foreground. Before that change we

Browse Source 
would create an empty pidfile on start and check if it changed on SIGHUP.

MFC after:	3 days
This commit is contained in:
Pawel Jakub Dawidek 2012-01-10 22:24:57 +00:00
parent bd4df56c71
commit 45bd093cb0
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=229944
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sbin/hastd/hastd.c
View File

@ -68,6 +68,8 @@ static struct hastd_config *cfg;
bool sigexit_received = false;
/* PID file handle. */
struct pidfh *pfh;
/* Do we run in foreground? */
static bool foreground;
/* How often check for hooks running for too long. */
#define REPORT_INTERVAL 5
@ -531,7 +533,7 @@ hastd_reload(void)
/*
* Check if pidfile's path has changed.
*/
if (strcmp(cfg->hc_pidfile, newcfg->hc_pidfile) != 0) {
if (!foreground && strcmp(cfg->hc_pidfile, newcfg->hc_pidfile) != 0) {
newpfh = pidfile_open(newcfg->hc_pidfile, 0600, &otherpid);
if (newpfh == NULL) {
if (errno == EEXIST) {
@ -1155,7 +1157,6 @@ main(int argc, char *argv[])
struct hastd_listen *lst;
const char *pidfile;
pid_t otherpid;
bool foreground;
int debuglevel;
sigset_t mask;
@ -1220,16 +1221,23 @@ main(int argc, char *argv[])
pjdlog_exitx(EX_CONFIG, "Pidfile path is too long.");
}
}
pfh = pidfile_open(cfg->hc_pidfile, 0600, &otherpid);
if (pfh == NULL) {
if (errno == EEXIST) {
pjdlog_exitx(EX_TEMPFAIL,
"Another hastd is already running, pidfile: %s, pid: %jd.",
cfg->hc_pidfile, (intmax_t)otherpid);
if (!foreground) {
pfh = pidfile_open(cfg->hc_pidfile, 0600, &otherpid);
if (pfh == NULL) {
if (errno == EEXIST) {
pjdlog_exitx(EX_TEMPFAIL,
"Another hastd is already running, pidfile: %s, pid: %jd.",
cfg->hc_pidfile, (intmax_t)otherpid);
}
/*
* If we cannot create pidfile for other reasons,
* only warn.
*/
pjdlog_errno(LOG_WARNING,
"Unable to open or create pidfile %s",
cfg->hc_pidfile);
}
/* If we cannot create pidfile for other reasons, only warn. */
pjdlog_errno(LOG_WARNING, "Unable to open or create pidfile %s",
cfg->hc_pidfile);
}
/*