faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

main: refactor check of pidfile

Browse source
This commit is contained in:
Miroslav Lichvar 2017-07-12 17:30:19 +02:00
parent 760285218f
commit 7bd1c02781
1 changed files with 16 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
main.c
View file

@ -241,48 +241,35 @@ post_init_rtc_hook(void *anything)
} }
/* ================================================== */ /* ================================================== */
/* Return 1 if the process exists on the system. */
static int static void
does_process_exist(int pid) check_pidfile(void)
{
int status;
status = getsid(pid);
if (status >= 0) {
return 1;
} else {
return 0;
}
}
/* ================================================== */
static int
maybe_another_chronyd_running(int *other_pid)
{ {
const char *pidfile = CNF_GetPidFile(); const char *pidfile = CNF_GetPidFile();
FILE *in; FILE *in;
int pid, count; int pid, count;
*other_pid = 0;
in = fopen(pidfile, "r"); in = fopen(pidfile, "r");
if (!in) return 0; if (!in)
return;
count = fscanf(in, "%d", &pid); count = fscanf(in, "%d", &pid);
fclose(in); fclose(in);
if (count != 1) return 0; if (count != 1)
return;
*other_pid = pid; if (getsid(pid) < 0)
return does_process_exist(pid); return;
LOG_FATAL("Another chronyd may already be running (pid=%d), check %s",
pid, pidfile);
} }
/* ================================================== */ /* ================================================== */
static void static void
write_lockfile(void) write_pidfile(void)
{ {
const char *pidfile = CNF_GetPidFile(); const char *pidfile = CNF_GetPidFile();
FILE *out; FILE *out;
@ -402,7 +389,6 @@ int main
struct passwd *pw; struct passwd *pw;
int opt, debug = 0, nofork = 0, address_family = IPADDR_UNSPEC; int opt, debug = 0, nofork = 0, address_family = IPADDR_UNSPEC;
int do_init_rtc = 0, restarted = 0, timeout = 0; int do_init_rtc = 0, restarted = 0, timeout = 0;
int other_pid;
int scfilter_level = 0, lock_memory = 0, sched_priority = 0; int scfilter_level = 0, lock_memory = 0, sched_priority = 0;
int clock_control = 1, system_log = 1; int clock_control = 1, system_log = 1;
int config_args = 0; int config_args = 0;
@ -519,17 +505,11 @@ int main
CNF_ParseLine(NULL, config_args + optind - argc + 1, argv[optind]); CNF_ParseLine(NULL, config_args + optind - argc + 1, argv[optind]);
} }
/* Check whether another chronyd may already be running. Do this after /* Check whether another chronyd may already be running */
* forking, so that message logging goes to the right place (i.e. syslog), in check_pidfile();
* case this chronyd is being run from a boot script. */
if (maybe_another_chronyd_running(&other_pid)) {
LOG_FATAL("Another chronyd may already be running (pid=%d), check lockfile (%s)",
other_pid, CNF_GetPidFile());
}
/* Write our lockfile to prevent other chronyds running. This has *GOT* to /* Write our pidfile to prevent other chronyds running */
* be done *AFTER* the daemon-creation fork() */ write_pidfile();
write_lockfile();
PRV_Initialise(); PRV_Initialise();
LCL_Initialise(); LCL_Initialise();