mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 06:15:47 +00:00
Code Issues Releases Wiki Activity

daemon: Integrate checking for an existing pidfile into daemonize_start().

Browse Source 
Until now, it has been the responsibility of an individual daemon to call
die_if_already_running() at an appropriate time.  A long time ago, this
had to happen *before* daemonizing, because once the process daemonized
itself there was no way to report failure to the process that originally
started the daemon.  With the introduction of daemonize_start(), this is
now possible, but we haven't been taking advantage of it.

Therefore, this commit integrates the die_if_already_running() call into
daemonize_start() and deletes the calls to it from individual daemons.
This commit is contained in:
Ben Pfaff
2011-03-31 09:44:30 -07:00
parent af9a144207
commit 00c0858987
13 changed files with 13 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/daemon.c
View File

@@ -107,9 +107,9 @@ is_chdir_enabled(void)
return chdir_;
}
/* Normally, die_if_already_running() will terminate the program with a message
* if a locked pidfile already exists. If this function is called,
* die_if_already_running() will merely log a warning. */
/* Normally, daemonize() or damonize_start() will terminate the program with a
* message if a locked pidfile already exists. If this function is called, an
* existing pidfile will be replaced, with a warning. */
void
ignore_existing_pidfile(void)
{
@@ -141,7 +141,7 @@ daemon_set_monitor(void)
/* If a locked pidfile exists, issue a warning message and, unless
* ignore_existing_pidfile() has been called, terminate the program. */
void
static void
die_if_already_running(void)
{
pid_t pid;
@@ -449,6 +449,7 @@ daemonize_start(void)
/* Running in daemon process. */
}
die_if_already_running();
make_pidfile();
/* Make sure that the unixctl commands for vlog get registered in a