summaryrefslogtreecommitdiff
path: root/utilities/ovs-controller.c
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2011-03-31 09:44:30 -0700
committerBen Pfaff <blp@nicira.com>2011-04-04 10:58:55 -0700
commit00c08589876b7c1cd8f57e5ebb3e66bb164c5a3d (patch)
tree975fd01be03267487ef2fc4317484ada0a5c27b0 /utilities/ovs-controller.c
parentaf9a144207eb1b4fdfd735b29f90c41f80aa9a2e (diff)
downloadopenvswitch-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 'utilities/ovs-controller.c')
-rw-r--r--utilities/ovs-controller.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/utilities/ovs-controller.c b/utilities/ovs-controller.c
index af9e11f0d..ae0ea3da1 100644
--- a/utilities/ovs-controller.c
+++ b/utilities/ovs-controller.c
@@ -139,7 +139,6 @@ main(int argc, char *argv[])
ovs_fatal(0, "no active or passive switch connections");
}
- die_if_already_running();
daemonize_start();
retval = unixctl_server_create(unixctl_path, &unixctl);