diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-11-06 19:33:02 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-11-09 17:53:18 +0100 |
| commit | 2d8c5e9efad1d4ea6fbbd330db68d562ba886359 (patch) | |
| tree | 7750af5808b96b2b0520aedfe29c19c8ddb6079e | |
| parent | 1eeca3c606aba71937d129c0a45f38d88f4d7178 (diff) | |
| download | NetworkManager-2d8c5e9efad1d4ea6fbbd330db68d562ba886359.tar.gz | |
core/ovs: cleanup debug logging for OVS command
- always print the JSON string as last (if present). Previously
that didn't happen with OVSDB_SET_INTERFACE_MTU.
- introduce _QUOTE_MSG() macro.
| -rw-r--r-- | src/devices/ovs/nm-ovsdb.c | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/src/devices/ovs/nm-ovsdb.c b/src/devices/ovs/nm-ovsdb.c index f197dcf362..2a17f08666 100644 --- a/src/devices/ovs/nm-ovsdb.c +++ b/src/devices/ovs/nm-ovsdb.c @@ -141,14 +141,14 @@ typedef struct { static void _LOGT_call_do(const char *comment, OvsdbMethodCall *call, json_t *msg) { - gs_free char *str = NULL; + gs_free char *msg_as_str = NULL; - if (msg) - str = json_dumps(msg, 0); +#define _QUOTE_MSG(msg, msg_as_str) \ + (msg) ? ": " : "", (msg) ? (msg_as_str = json_dumps((msg), 0)) : "" switch (call->command) { case OVSDB_MONITOR: - _LOGT("%s: monitor%s%s", comment, msg ? ": " : "", msg ? str : ""); + _LOGT("%s: monitor%s%s", comment, _QUOTE_MSG(msg, msg_as_str)); break; case OVSDB_ADD_INTERFACE: _LOGT("%s: add-iface bridge=%s port=%s interface=%s%s%s", @@ -156,23 +156,17 @@ _LOGT_call_do(const char *comment, OvsdbMethodCall *call, json_t *msg) nm_connection_get_interface_name(call->bridge), nm_connection_get_interface_name(call->port), nm_connection_get_interface_name(call->interface), - msg ? ": " : "", - msg ? str : ""); + _QUOTE_MSG(msg, msg_as_str)); break; case OVSDB_DEL_INTERFACE: - _LOGT("%s: del-iface interface=%s%s%s", - comment, - call->ifname, - msg ? ": " : "", - msg ? str : ""); + _LOGT("%s: del-iface interface=%s%s%s", comment, call->ifname, _QUOTE_MSG(msg, msg_as_str)); break; case OVSDB_SET_INTERFACE_MTU: - _LOGT("%s: set-iface-mtu interface=%s%s%s mtu=%u", + _LOGT("%s: set-iface-mtu interface=%s mtu=%u%s%s", comment, call->ifname, - msg ? ": " : "", - msg ? str : "", - call->mtu); + call->mtu, + _QUOTE_MSG(msg, msg_as_str)); break; } } |