diff options
author | Thomas Haller <thaller@redhat.com> | 2015-09-04 13:11:58 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2015-09-04 13:45:13 +0200 |
commit | 9dbc63ac71ba119a785290f4d7049330fb9d37b5 (patch) | |
tree | 31a5b2acbdc08886a64136163e70d9fb29b89de3 | |
parent | 1d06000696276e818ec1b8ead21e1ff1fd03cdaf (diff) | |
download | NetworkManager-9dbc63ac71ba119a785290f4d7049330fb9d37b5.tar.gz |
dns: add _LOG*() macros to "nm-dns-manager.c"
-rw-r--r-- | src/dns-manager/nm-dns-manager.c | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c index 802bb7a752..adee402010 100644 --- a/src/dns-manager/nm-dns-manager.c +++ b/src/dns-manager/nm-dns-manager.c @@ -82,6 +82,35 @@ G_DEFINE_TYPE (NMDnsManager, nm_dns_manager, G_TYPE_OBJECT) #define NETCONFIG_PATH "/sbin/netconfig" #endif +NM_DEFINE_SINGLETON_INSTANCE (NMDnsManager); + +/*********************************************************************************************/ + +#define _NMLOG_PREFIX_NAME "dns-mgr" +#define _NMLOG_DOMAIN LOGD_DNS +#define _NMLOG(level, ...) \ + G_STMT_START { \ + const NMLogLevel __level = (level); \ + \ + if (nm_logging_enabled (__level, _NMLOG_DOMAIN)) { \ + char __prefix[20]; \ + const NMDnsManager *const __self = (self); \ + \ + _nm_log (__level, _NMLOG_DOMAIN, 0, \ + "%s: " _NM_UTILS_MACRO_FIRST (__VA_ARGS__), \ + ((__self == singleton_instance) \ + ? _NMLOG_PREFIX_NAME \ + : ({ \ + g_snprintf (__prefix, sizeof (__prefix), "%s[%p]", _NMLOG_PREFIX_NAME, __self); \ + __prefix; \ + }) \ + ) \ + _NM_UTILS_MACRO_REST (__VA_ARGS__)); \ + } \ + } G_STMT_END + +/*********************************************************************************************/ + typedef struct { NMIP4Config *ip4_vpn_config; NMIP4Config *ip4_device_config; |