summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2015-07-03 11:47:53 +0200
committerThomas Haller <thaller@redhat.com>2015-08-20 18:05:43 +0200
commit494b52a832db25802e12e700491bf7d321156c9c (patch)
treebd5dd6e30508f99bf9cefa0e8b67cd0939d4e62d
parent1b3bb295c53804543ce615ef1ce2e7813978cf9f (diff)
downloadNetworkManager-494b52a832db25802e12e700491bf7d321156c9c.tar.gz
settings: add _LOG() macros to "nm-settings-connection.h"
(cherry picked from commit 5fb56a1df965ae2b22c4404904f8b73fea12102b)
-rw-r--r--src/settings/nm-settings-connection.c42
1 files changed, 42 insertions, 0 deletions
diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c
index 9ffaf36a65..5ecf3c707b 100644
--- a/src/settings/nm-settings-connection.c
+++ b/src/settings/nm-settings-connection.c
@@ -42,6 +42,48 @@
#define SETTINGS_TIMESTAMPS_FILE NMSTATEDIR "/timestamps"
#define SETTINGS_SEEN_BSSIDS_FILE NMSTATEDIR "/seen-bssids"
+
+#define _LOG_DOMAIN LOGD_SETTINGS
+#define _LOG_PREFIX_NAME "settings-connection"
+
+#define _LOG(level, domain, self, ...) \
+ G_STMT_START { \
+ const NMLogLevel __level = (level); \
+ const NMLogDomain __domain = (domain); \
+ \
+ if (nm_logging_enabled (__level, __domain)) { \
+ char __prefix[128]; \
+ const char *__p_prefix = _LOG_PREFIX_NAME; \
+ const void *const __self = (self); \
+ \
+ if (__self) { \
+ const char *__uuid = nm_connection_get_uuid ((NMConnection *) __self); \
+ \
+ g_snprintf (__prefix, sizeof (__prefix), "%s[%p%s%s]", _LOG_PREFIX_NAME, __self, __uuid ? "," : "", __uuid ? __uuid : ""); \
+ __p_prefix = __prefix; \
+ } \
+ _nm_log (__level, __domain, 0, \
+ "%s: " _NM_UTILS_MACRO_FIRST (__VA_ARGS__), \
+ __p_prefix _NM_UTILS_MACRO_REST (__VA_ARGS__)); \
+ } \
+ } G_STMT_END
+#define _LOG_LEVEL_ENABLED(level, domain) \
+ ( nm_logging_enabled ((level), (domain)) )
+
+#ifdef NM_MORE_LOGGING
+#define _LOGT_ENABLED() _LOG_LEVEL_ENABLED (LOGL_TRACE, _LOG_DOMAIN)
+#define _LOGT(...) _LOG (LOGL_TRACE, _LOG_DOMAIN, self, __VA_ARGS__)
+#else
+#define _LOGT_ENABLED() FALSE
+#define _LOGT(...) G_STMT_START { if (FALSE) { _LOG (LOGL_TRACE, _LOG_DOMAIN, self, __VA_ARGS__); } } G_STMT_END
+#endif
+
+#define _LOGD(...) _LOG (LOGL_DEBUG, _LOG_DOMAIN, self, __VA_ARGS__)
+#define _LOGI(...) _LOG (LOGL_INFO , _LOG_DOMAIN, self, __VA_ARGS__)
+#define _LOGW(...) _LOG (LOGL_WARN , _LOG_DOMAIN, self, __VA_ARGS__)
+#define _LOGE(...) _LOG (LOGL_ERR , _LOG_DOMAIN, self, __VA_ARGS__)
+
+
static void impl_settings_connection_get_settings (NMSettingsConnection *self,
DBusGMethodInvocation *context);