From 9dbc190c816b51dad3ca80bb9fb3835769758781 Mon Sep 17 00:00:00 2001 From: Ethan Jackson Date: Tue, 17 Jul 2012 09:28:08 -0700 Subject: [PATCH] ovsdb-server, ovs-vswitchd: Log version after daemonize_complete(). This fixes unit tests, and generally seems more correct. Signed-off-by: Ethan Jackson [blp@nicira.com added the change to ovs-vswitchd] Signed-off-by: Ben Pfaff --- ovsdb/ovsdb-server.c | 4 ++-- vswitchd/bridge.c | 2 ++ vswitchd/ovs-vswitchd.c | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c index 8412cbb9..b430b0e5 100644 --- a/ovsdb/ovsdb-server.c +++ b/ovsdb/ovsdb-server.c @@ -105,8 +105,6 @@ main(int argc, char *argv[]) daemonize_start(); - VLOG_INFO("%s (Open vSwitch) %s", program_name, VERSION); - error = ovsdb_file_open(file_name, false, &db, &file); if (error) { ovs_fatal(0, "%s", ovsdb_error_to_string(error)); @@ -139,6 +137,8 @@ main(int argc, char *argv[]) daemonize_complete(); + VLOG_INFO("%s (Open vSwitch) %s", program_name, VERSION); + unixctl_command_register("exit", "", 0, 0, ovsdb_server_exit, &exiting); unixctl_command_register("ovsdb-server/compact", "", 0, 0, ovsdb_server_compact, file); diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 3a3e58b1..fa835e73 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -556,6 +556,8 @@ bridge_reconfigure_continue(const struct ovsrec_open_vswitch *ovs_cfg) * forked us to exit successfully. */ daemonize_complete(); reconfiguring = false; + + VLOG_INFO("%s (Open vSwitch) %s", program_name, VERSION); } return done; diff --git a/vswitchd/ovs-vswitchd.c b/vswitchd/ovs-vswitchd.c index 3b651788..6062a40a 100644 --- a/vswitchd/ovs-vswitchd.c +++ b/vswitchd/ovs-vswitchd.c @@ -85,8 +85,6 @@ main(int argc, char *argv[]) daemonize_start(); - VLOG_INFO("%s (Open vSwitch) %s", program_name, VERSION); - if (want_mlockall) { #ifdef HAVE_MLOCKALL if (mlockall(MCL_CURRENT | MCL_FUTURE)) { -- 2.30.2