colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

manager: add logging macro _NMLOG2() for logging device messages

Browse Source 
It unifies the way how we print the logging prefix, but also it
passes the ifname down for structured logging.
This commit is contained in:
Thomas Haller
2017-06-07 12:46:10 +02:00
parent 2ae891b592
commit 1f6078bcf5
3 changed files with 63 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/devices/nm-device-logging.h
View File

@@ -40,7 +40,7 @@ _nm_device_log_self_to_device (t *self) \
\ \
if (nm_logging_enabled (_level, _domain)) { \ if (nm_logging_enabled (_level, _domain)) { \
typeof (*self) *const _self = (self); \ typeof (*self) *const _self = (self); \
const char *const _ifname = _self ? nm_device_get_iface (_nm_device_log_self_to_device (_self)) : NULL; \ const char *const _ifname = _nm_device_get_iface (_nm_device_log_self_to_device (_self)); \
\ \
nm_log_obj (_level, _domain, \ nm_log_obj (_level, _domain, \
_ifname, NULL, \ _ifname, NULL, \

9
src/devices/nm-device.h
View File

@@ -421,6 +421,15 @@ NMPlatform *nm_device_get_platform (NMDevice *self);
const char * nm_device_get_udi (NMDevice *dev); const char * nm_device_get_udi (NMDevice *dev);
const char * nm_device_get_iface (NMDevice *dev); const char * nm_device_get_iface (NMDevice *dev);
static inline const char *
_nm_device_get_iface (NMDevice *device)
{
/* like nm_device_get_iface(), but gracefully accept NULL without
* asserting. */
return device ? nm_device_get_iface (device) : NULL;
}
int nm_device_get_ifindex (NMDevice *dev); int nm_device_get_ifindex (NMDevice *dev);
gboolean nm_device_is_software (NMDevice *dev); gboolean nm_device_is_software (NMDevice *dev);
gboolean nm_device_is_real (NMDevice *dev); gboolean nm_device_is_real (NMDevice *dev);

97
src/nm-manager.c
View File

@@ -223,19 +223,41 @@ NM_DEFINE_SINGLETON_INSTANCE (NMManager);
#define _NMLOG_PREFIX_NAME "manager" #define _NMLOG_PREFIX_NAME "manager"
#define _NMLOG(level, domain, ...) \ #define _NMLOG(level, domain, ...) \
G_STMT_START { \ G_STMT_START { \
const NMLogLevel __level = (level); \ const NMLogLevel _level = (level); \
const NMLogDomain __domain = (domain); \ const NMLogDomain _domain = (domain); \
\ \
if (nm_logging_enabled (__level, __domain)) { \ if (nm_logging_enabled (_level, _domain)) { \
const NMManager *const __self = (self); \ const NMManager *const _self = (self); \
char __sbuf[32]; \ char _sbuf[32]; \
\ \
_nm_log (__level, __domain, 0, NULL, NULL, \ _nm_log (_level, _domain, 0, NULL, NULL, \
"%s%s: " _NM_UTILS_MACRO_FIRST (__VA_ARGS__), \ "%s%s: " _NM_UTILS_MACRO_FIRST (__VA_ARGS__), \
_NMLOG_PREFIX_NAME, \ _NMLOG_PREFIX_NAME, \
(__self && __self != singleton_instance) \ ((_self && _self != singleton_instance) \
? nm_sprintf_buf (__sbuf, "[%p]", __self) \ ? nm_sprintf_buf (_sbuf, "[%p]", _self) \
: "" \ : "") \
_NM_UTILS_MACRO_REST (__VA_ARGS__)); \
} \
} G_STMT_END
#define _NMLOG2(level, domain, device, ...) \
G_STMT_START { \
const NMLogLevel _level = (level); \
const NMLogDomain _domain = (domain); \
\
if (nm_logging_enabled (_level, _domain)) { \
const NMManager *const _self = (self); \
const char *const _ifname = _nm_device_get_iface (device); \
char _sbuf[32]; \
\
_nm_log (_level, _domain, 0, \
_ifname, NULL, \
"%s%s: %s%s%s" _NM_UTILS_MACRO_FIRST (__VA_ARGS__), \
_NMLOG_PREFIX_NAME, \
((_self && _self != singleton_instance) \
? nm_sprintf_buf (_sbuf, "[%p]", _self) \
: ""), \
NM_PRINT_FMT_QUOTED (_ifname, "(", _ifname, "): ", "") \
_NM_UTILS_MACRO_REST (__VA_ARGS__)); \ _NM_UTILS_MACRO_REST (__VA_ARGS__)); \
} \ } \
} G_STMT_END } G_STMT_END
@@ -984,8 +1006,8 @@ remove_device (NMManager *self,
NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self); NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
gboolean unmanage = FALSE; gboolean unmanage = FALSE;
_LOGD (LOGD_DEVICE, "(%s): removing device (allow_unmanage %d, managed %d)", _LOG2D (LOGD_DEVICE, device, "removing device (allow_unmanage %d, managed %d)",
nm_device_get_iface (device), allow_unmanage, nm_device_get_managed (device, FALSE)); allow_unmanage, nm_device_get_managed (device, FALSE));
if (allow_unmanage && nm_device_get_managed (device, FALSE)) { if (allow_unmanage && nm_device_get_managed (device, FALSE)) {
@@ -1464,9 +1486,7 @@ manager_update_radio_enabled (NMManager *self,
NMDevice *device = NM_DEVICE (iter->data); NMDevice *device = NM_DEVICE (iter->data);
if (nm_device_get_rfkill_type (device) == rstate->rtype) { if (nm_device_get_rfkill_type (device) == rstate->rtype) {
_LOGD (LOGD_RFKILL, "(%s): setting radio %s", _LOG2D (LOGD_RFKILL, device, "setting radio %s", enabled ? "enabled" : "disabled");
nm_device_get_iface (device),
enabled ? "enabled" : "disabled");
nm_device_set_enabled (device, enabled); nm_device_set_enabled (device, enabled);
} }
} }
@@ -1707,13 +1727,13 @@ get_existing_connection (NMManager *self,
if (master_ifindex) { if (master_ifindex) {
master = nm_manager_get_device_by_ifindex (self, master_ifindex); master = nm_manager_get_device_by_ifindex (self, master_ifindex);
if (!master) { if (!master) {
_LOGD (LOGD_DEVICE, "(%s): cannot generate connection for slave before its master (%s/%d)", _LOG2D (LOGD_DEVICE, device, "cannot generate connection for slave before its master (%s/%d)",
nm_device_get_iface (device), nm_platform_link_get_name (NM_PLATFORM_GET, master_ifindex), master_ifindex); nm_platform_link_get_name (NM_PLATFORM_GET, master_ifindex), master_ifindex);
return NULL; return NULL;
} }
if (!nm_device_get_act_request (master)) { if (!nm_device_get_act_request (master)) {
_LOGD (LOGD_DEVICE, "(%s): cannot generate connection for slave before master %s activates", _LOG2D (LOGD_DEVICE, device, "cannot generate connection for slave before master %s activates",
nm_device_get_iface (device), nm_device_get_iface (master)); nm_device_get_iface (master));
return NULL; return NULL;
} }
} }
@@ -1794,20 +1814,18 @@ get_existing_connection (NMManager *self,
} }
if (matched) { if (matched) {
_LOGI (LOGD_DEVICE, "(%s): found matching connection '%s' (%s)%s", _LOG2I (LOGD_DEVICE, device, "found matching connection '%s' (%s)%s",
nm_device_get_iface (device), nm_settings_connection_get_id (matched),
nm_settings_connection_get_id (matched), nm_settings_connection_get_uuid (matched),
nm_settings_connection_get_uuid (matched), assume_state_connection_uuid && nm_streq (assume_state_connection_uuid, nm_settings_connection_get_uuid (matched))
assume_state_connection_uuid && nm_streq (assume_state_connection_uuid, nm_settings_connection_get_uuid (matched)) ? " (indicated)" : " (guessed)");
? " (indicated)" : " (guessed)");
g_object_unref (connection); g_object_unref (connection);
nm_device_assume_state_reset (device); nm_device_assume_state_reset (device);
return matched; return matched;
} }
_LOGD (LOGD_DEVICE, "(%s): generated connection '%s'", _LOG2D (LOGD_DEVICE, device, "generated connection '%s'",
nm_device_get_iface (device), nm_connection_get_id (connection));
nm_connection_get_id (connection));
nm_device_assume_state_reset (device); nm_device_assume_state_reset (device);
@@ -1820,8 +1838,7 @@ get_existing_connection (NMManager *self,
if (out_generated) if (out_generated)
*out_generated = TRUE; *out_generated = TRUE;
} else { } else {
_LOGW (LOGD_SETTINGS, "(%s) Couldn't save generated connection '%s': %s", _LOG2W (LOGD_SETTINGS, device, "Couldn't save generated connection '%s': %s",
nm_device_get_iface (device),
nm_connection_get_id (connection), nm_connection_get_id (connection),
error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
@@ -1856,13 +1873,11 @@ recheck_assume_connection (NMManager *self,
connection = get_existing_connection (self, device, &generated); connection = get_existing_connection (self, device, &generated);
if (!connection) { if (!connection) {
_LOGD (LOGD_DEVICE, "(%s): can't assume; no connection", _LOG2D (LOGD_DEVICE, device, "can't assume; no connection");
nm_device_get_iface (device));
return FALSE; return FALSE;
} }
_LOGD (LOGD_DEVICE, "(%s): will attempt to assume connection", _LOG2D (LOGD_DEVICE, device, "will attempt to assume connection");
nm_device_get_iface (device));
nm_device_sys_iface_state_set (device, nm_device_sys_iface_state_set (device,
generated generated
@@ -1909,9 +1924,7 @@ recheck_assume_connection (NMManager *self,
} }
if (generated) { if (generated) {
_LOGD (LOGD_DEVICE, "(%s): connection assumption failed. Deleting generated connection", _LOG2D (LOGD_DEVICE, device, "connection assumption failed. Deleting generated connection");
nm_device_get_iface (device));
nm_settings_connection_delete (connection, NULL, NULL); nm_settings_connection_delete (connection, NULL, NULL);
} else { } else {
if (nm_device_sys_iface_state_get (device) == NM_DEVICE_SYS_IFACE_STATE_ASSUME) if (nm_device_sys_iface_state_get (device) == NM_DEVICE_SYS_IFACE_STATE_ASSUME)
@@ -2165,7 +2178,7 @@ add_device (NMManager *self, NMDevice *device, GError **error)
manager_sleeping (self)); manager_sleeping (self));
dbus_path = nm_exported_object_export (NM_EXPORTED_OBJECT (device)); dbus_path = nm_exported_object_export (NM_EXPORTED_OBJECT (device));
_LOGI (LOGD_DEVICE, "(%s): new %s device (%s)", iface, type_desc, dbus_path); _LOG2I (LOGD_DEVICE, device, "new %s device (%s)", type_desc, dbus_path);
nm_settings_device_added (priv->settings, device); nm_settings_device_added (priv->settings, device);
g_signal_emit (self, signals[INTERNAL_DEVICE_ADDED], 0, device); g_signal_emit (self, signals[INTERNAL_DEVICE_ADDED], 0, device);
@@ -2204,8 +2217,7 @@ factory_device_added_cb (NMDeviceFactory *factory,
add_device (self, device, NULL); add_device (self, device, NULL);
_device_realize_finish (self, device, NULL); _device_realize_finish (self, device, NULL);
} else { } else {
_LOGW (LOGD_DEVICE, "(%s): failed to realize device: %s", _LOG2W (LOGD_DEVICE, device, "failed to realize device: %s", error->message);
nm_device_get_iface (device), error->message);
g_error_free (error); g_error_free (error);
} }
} }
@@ -2397,9 +2409,7 @@ _platform_link_cb_idle (PlatformLinkCbData *data)
nm_device_sys_iface_state_set (device, NM_DEVICE_SYS_IFACE_STATE_REMOVED); nm_device_sys_iface_state_set (device, NM_DEVICE_SYS_IFACE_STATE_REMOVED);
/* Our software devices stick around until their connection is removed */ /* Our software devices stick around until their connection is removed */
if (!nm_device_unrealize (device, FALSE, &error)) { if (!nm_device_unrealize (device, FALSE, &error)) {
_LOGW (LOGD_DEVICE, "(%s): failed to unrealize: %s", _LOG2W (LOGD_DEVICE, device, "failed to unrealize: %s", error->message);
nm_device_get_iface (device),
error->message);
g_clear_error (&error); g_clear_error (&error);
remove_device (self, device, FALSE, TRUE); remove_device (self, device, FALSE, TRUE);
} }
@@ -5153,8 +5163,7 @@ handle_firmware_changed (gpointer user_data)
if ( nm_device_get_firmware_missing (candidate) if ( nm_device_get_firmware_missing (candidate)
&& (state == NM_DEVICE_STATE_UNAVAILABLE)) { && (state == NM_DEVICE_STATE_UNAVAILABLE)) {
_LOGI (LOGD_CORE, "(%s): firmware may now be available", _LOG2I (LOGD_CORE, candidate, "firmware may now be available");
nm_device_get_iface (candidate));
/* Re-set unavailable state to try bringing the device up again */ /* Re-set unavailable state to try bringing the device up again */
nm_device_state_changed (candidate, nm_device_state_changed (candidate,