diff options
| author | Ben Pfaff <blp@nicira.com> | 2011-03-31 09:44:30 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2011-04-04 10:58:55 -0700 |
| commit | 00c08589876b7c1cd8f57e5ebb3e66bb164c5a3d (patch) | |
| tree | 975fd01be03267487ef2fc4317484ada0a5c27b0 /ovsdb | |
| parent | af9a144207eb1b4fdfd735b29f90c41f80aa9a2e (diff) | |
| download | openvswitch-00c08589876b7c1cd8f57e5ebb3e66bb164c5a3d.tar.gz | |
daemon: Integrate checking for an existing pidfile into daemonize_start().
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.
Diffstat (limited to 'ovsdb')
| -rw-r--r-- | ovsdb/ovsdb-server.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c index df0bc953a..c9b0fdd95 100644 --- a/ovsdb/ovsdb-server.c +++ b/ovsdb/ovsdb-server.c @@ -101,7 +101,6 @@ main(int argc, char *argv[]) parse_options(argc, argv, &file_name, &remotes, &unixctl_path, &run_command); - die_if_already_running(); daemonize_start(); error = ovsdb_file_open(file_name, false, &db, &file); |