diff options
| author | Ben Pfaff <blp@ovn.org> | 2016-03-30 20:11:44 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2016-03-30 22:38:49 -0700 |
| commit | a6be657b299369da9780b67fe2f11caf835e6355 (patch) | |
| tree | 2fc731b5f37eb4e1a15245ee7294c57244ea5612 | |
| parent | 1021e19b1d729b1eff9e4ea91d71b5dec5d1261d (diff) | |
| download | openvswitch-a6be657b299369da9780b67fe2f11caf835e6355.tar.gz | |
ovsdb: Improve error message from ovsdb_log_open() open failure.
Previously, error messages ended up looking like:
ovsdb-tool: I/O error: create: $DBFILE failed (File exists)
which is hard to understand. This commit changes them to:
ovsdb-tool: I/O error: $DBFILE: create failed (File exists)
which makes more sense.
Signed-off-by: Ben Pfaff <blp@ovn.org>
Acked-by: Russell Bryant <russell@ovn.org>
| -rw-r--r-- | ovsdb/log.c | 2 | ||||
| -rw-r--r-- | tests/ovsdb-log.at | 2 | ||||
| -rw-r--r-- | tests/ovsdb-server.at | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ovsdb/log.c b/ovsdb/log.c index c1f822551..8004d3dce 100644 --- a/ovsdb/log.c +++ b/ovsdb/log.c @@ -114,7 +114,7 @@ ovsdb_log_open(const char *name, enum ovsdb_log_open_mode open_mode, fd = open(name, flags, 0666); if (fd < 0) { const char *op = open_mode == OVSDB_LOG_CREATE ? "create" : "open"; - error = ovsdb_io_error(errno, "%s: %s failed", op, name); + error = ovsdb_io_error(errno, "%s: %s failed", name, op); goto error_unlock; } diff --git a/tests/ovsdb-log.at b/tests/ovsdb-log.at index 055dc70c5..3e7cdf828 100644 --- a/tests/ovsdb-log.at +++ b/tests/ovsdb-log.at @@ -47,7 +47,7 @@ file: read: [1] ]], [ignore]) AT_CHECK( [test-ovsdb log-io file create read], [1], - [], [test-ovsdb: I/O error: create: file failed (File exists) + [], [test-ovsdb: I/O error: file: create failed (File exists) ]) AT_CHECK([test -f .file.~lock~]) AT_CLEANUP diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at index de40330a1..7b7fb405d 100644 --- a/tests/ovsdb-server.at +++ b/tests/ovsdb-server.at @@ -202,7 +202,7 @@ fi # Add a non-existing database. AT_CHECK([ovs-appctl -t ovsdb-server ovsdb-server/add-db db3], 2, [], [stderr]) AT_CHECK([sed 's/(.*)/(...)/' stderr], [0], - [I/O error: open: db3 failed (...) + [I/O error: db3: open failed (...) ovs-appctl: ovsdb-server: server returned an error ]) |