mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-29 13:27:59 +00:00
Code Issues Releases Wiki Activity

ovsdb-server, ovs-vswitchd: Log version after daemonize_complete().

Browse Source 
This fixes unit tests, and generally seems more correct.

Signed-off-by: Ethan Jackson <ethan@nicira.com>
[blp@nicira.com added the change to ovs-vswitchd]
Signed-off-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Ethan Jackson 2012-07-17 09:28:08 -07:00 committed by Ben Pfaff
parent 1ec3db6fd8
commit 9dbc190c81
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ovsdb/ovsdb-server.c
View File

@ -105,8 +105,6 @@ main(int argc, char *argv[])
daemonize_start(); daemonize_start();
VLOG_INFO("%s (Open vSwitch) %s", program_name, VERSION);
error = ovsdb_file_open(file_name, false, &db, &file); error = ovsdb_file_open(file_name, false, &db, &file);
if (error) { if (error) {
ovs_fatal(0, "%s", ovsdb_error_to_string(error)); ovs_fatal(0, "%s", ovsdb_error_to_string(error));
@ -139,6 +137,8 @@ main(int argc, char *argv[])
daemonize_complete(); daemonize_complete();
VLOG_INFO("%s (Open vSwitch) %s", program_name, VERSION);
unixctl_command_register("exit", "", 0, 0, ovsdb_server_exit, &exiting); unixctl_command_register("exit", "", 0, 0, ovsdb_server_exit, &exiting);
unixctl_command_register("ovsdb-server/compact", "", 0, 0, unixctl_command_register("ovsdb-server/compact", "", 0, 0,
ovsdb_server_compact, file); ovsdb_server_compact, file);

2
vswitchd/bridge.c
View File

@ -556,6 +556,8 @@ bridge_reconfigure_continue(const struct ovsrec_open_vswitch *ovs_cfg)
* forked us to exit successfully. */ * forked us to exit successfully. */
daemonize_complete(); daemonize_complete();
reconfiguring = false; reconfiguring = false;
VLOG_INFO("%s (Open vSwitch) %s", program_name, VERSION);
} }
return done; return done;

2
vswitchd/ovs-vswitchd.c
View File

@ -85,8 +85,6 @@ main(int argc, char *argv[])
daemonize_start(); daemonize_start();
VLOG_INFO("%s (Open vSwitch) %s", program_name, VERSION);
if (want_mlockall) { if (want_mlockall) {
#ifdef HAVE_MLOCKALL #ifdef HAVE_MLOCKALL
if (mlockall(MCL_CURRENT | MCL_FUTURE)) { if (mlockall(MCL_CURRENT | MCL_FUTURE)) {