diff options
| author | Ethan Jackson <ethan@nicira.com> | 2012-07-17 10:07:36 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2012-07-17 10:07:49 -0700 |
| commit | 08b9b19009d5fcddc229519010f0c6c317d0b08d (patch) | |
| tree | afa81c0d65e65ca6de6cc1e9379c307d8184b6be /ovsdb | |
| parent | 9dbc190c816b51dad3ca80bb9fb3835769758781 (diff) | |
tests: Fix unit test failures related to additional logging.
Commit a890678229 (userspace: Log version on startup.) added
additional logging to ovsdb-server and ovs-vswitchd, but failed to
make certain the unit tests still passed.
Signed-off-by: Ethan Jackson <ethan@nicira.com>
[blp@nicira.com changed the strategy for fixing ovsdb-server.at]
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'ovsdb')
| -rw-r--r-- | ovsdb/ovsdb-server.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c index b430b0e5..139acc61 100644 --- a/ovsdb/ovsdb-server.c +++ b/ovsdb/ovsdb-server.c @@ -137,7 +137,12 @@ main(int argc, char *argv[]) daemonize_complete(); - VLOG_INFO("%s (Open vSwitch) %s", program_name, VERSION); + if (!run_command) { + /* ovsdb-server is usually a long-running process, in which case it + * makes plenty of sense to log the version, but --run makes + * ovsdb-server more like a command-line tool, so skip it. */ + 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, |