fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-11 22:20:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core/ovs: cleanup debug logging for OVS command

Browse source 
- always print the JSON string as last (if present). Previously
  that didn't happen with OVSDB_SET_INTERFACE_MTU.

- introduce _QUOTE_MSG() macro.
This commit is contained in:
Thomas Haller 2020-11-06 19:33:02 +01:00
parent 1eeca3c606
commit 2d8c5e9efa
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/devices/ovs/nm-ovsdb.c
View file

@ -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;
}
}