summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2017-03-16 15:26:18 +0100
committerBeniamino Galvani <bgalvani@redhat.com>2017-04-03 13:30:50 +0200
commit6cc6c429934dc674d40fb5956d11f27803885fe0 (patch)
tree5a46790c8ab1ea4ee0a4558e420be831e72957ae
parent9e81a339499960dd644b8f8a5544974daccef309 (diff)
downloadNetworkManager-6cc6c429934dc674d40fb5956d11f27803885fe0.tar.gz
default-route-manager: decryptify logging line for default-route-manager
The default route manager logs for each entry relevant information, in a compact but cryptic way: default-route: entry[0/dev:0x5633d5528560:enp0s25:1:+sync]: record:add 0.0.0.0/0 via 192.168.0.1 dev 2 metric 100 mss 0 rt-src user (100) The flag whether a route is configured or not, was only expressed via 0|1. Change that to log instead: default-route: entry[0/dev:0x5633d5528560:enp0s25:+has:+sync]: record:add 0.0.0.0/0 via 192.168.0.1 dev 2 metric 100 mss 0 rt-src user (100) (cherry picked from commit 82bfb6c46d2ff1ca01c7dffd0a812bf53e08ff33)
-rw-r--r--src/nm-default-route-manager.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nm-default-route-manager.c b/src/nm-default-route-manager.c
index 0764a702b0..a045c59f77 100644
--- a/src/nm-default-route-manager.c
+++ b/src/nm-default-route-manager.c
@@ -110,7 +110,7 @@ NM_DEFINE_SINGLETON_GETTER (NMDefaultRouteManager, nm_default_route_manager_get,
const Entry *const __entry = (entry); \
\
_nm_log (__level, __domain, 0, \
- "%s: entry[%u/%s:%p:%s:%c:%csync]: "_NM_UTILS_MACRO_FIRST(__VA_ARGS__), \
+ "%s: entry[%u/%s:%p:%s:%chas:%csync]: "_NM_UTILS_MACRO_FIRST(__VA_ARGS__), \
self != singleton_instance \
? nm_sprintf_buf (__prefix_buf, "%s%c[%p]", \
_NMLOG2_PREFIX_NAME, \
@@ -121,7 +121,7 @@ NM_DEFINE_SINGLETON_GETTER (NMDefaultRouteManager, nm_default_route_manager_get,
NM_IS_DEVICE (__entry->source.pointer) ? "dev" : "vpn", \
__entry->source.pointer, \
NM_IS_DEVICE (__entry->source.pointer) ? nm_device_get_iface (__entry->source.device) : nm_active_connection_get_settings_connection_id (NM_ACTIVE_CONNECTION (__entry->source.vpn)), \
- (__entry->never_default ? '0' : '1'), \
+ (__entry->never_default ? '-' : '+'), \
(__entry->synced ? '+' : '-') \
_NM_UTILS_MACRO_REST(__VA_ARGS__)); \
} \