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 /debian | |
| 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 'debian')
| -rwxr-xr-x | debian/ovs-monitor-ipsec | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/debian/ovs-monitor-ipsec b/debian/ovs-monitor-ipsec index 17f399767..febd5691d 100755 --- a/debian/ovs-monitor-ipsec +++ b/debian/ovs-monitor-ipsec @@ -1,5 +1,5 @@ #!/usr/bin/python -# Copyright (c) 2009, 2010 Nicira Networks +# Copyright (c) 2009, 2010, 2011 Nicira Networks # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -450,8 +450,6 @@ def main(argv): "(use --help for help)\n" % ovs.util.PROGRAM_NAME) sys.exit(1) - ovs.daemon.die_if_already_running() - remote = args[0] idl = ovs.db.idl.Idl(remote, "Open_vSwitch", monitor_uuid_schema_cb) |