diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2016-10-11 14:07:24 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2016-10-11 15:09:45 +0200 |
| commit | 20bb5cf742e59a50a257a2438589e1569245e6bb (patch) | |
| tree | b620c2a99cb243ccd536ccd265d4365694a0b250 | |
| parent | c0ae71c3ee9506f7a7a9d02a817a1767c0138234 (diff) | |
| download | NetworkManager-bg/session-monitor-none-bgo772640.tar.gz | |
session-monitor: use logging macrosbg/session-monitor-none-bgo772640
Use logging macros and also, print the session tracking method during
startup for debugging purposes.
| -rw-r--r-- | src/nm-session-monitor.c | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/src/nm-session-monitor.c b/src/nm-session-monitor.c index 54c74c87e1..e1c844f435 100644 --- a/src/nm-session-monitor.c +++ b/src/nm-session-monitor.c @@ -66,6 +66,17 @@ struct _NMSessionMonitorClass { G_DEFINE_TYPE (NMSessionMonitor, nm_session_monitor, G_TYPE_OBJECT); +#define _NMLOG_PREFIX_NAME "session-monitor" +#define _NMLOG_DOMAIN LOGD_CORE + +#define _NMLOG(level, ...) \ + G_STMT_START { \ + nm_log (level, _NMLOG_DOMAIN, \ + "%s: " _NM_UTILS_MACRO_FIRST(__VA_ARGS__), \ + _NMLOG_PREFIX_NAME \ + _NM_UTILS_MACRO_REST(__VA_ARGS__)); \ + } G_STMT_END + /*****************************************************************************/ #if defined (SESSION_TRACKING_SYSTEMD) @@ -80,8 +91,7 @@ st_sd_session_exists (NMSessionMonitor *monitor, uid_t uid, gboolean active) status = sd_uid_get_sessions (uid, active, NULL); if (status < 0) - nm_log_err (LOGD_CORE, "Failed to get systemd sessions for uid %d: %d", - uid, status); + _LOGE ("failed to get systemd sessions for uid %d: %d", uid, status); return status > 0; } @@ -108,7 +118,7 @@ st_sd_init (NMSessionMonitor *monitor) return; if ((status = sd_login_monitor_new (NULL, &monitor->sd.monitor)) < 0) { - nm_log_err (LOGD_CORE, "Failed to create systemd login monitor: %d", status); + _LOGE ("failed to create systemd login monitor: %d", status); return; } @@ -144,7 +154,7 @@ ck_load_cache (GHashTable *cache) goto out; if (!(groups = g_key_file_get_groups (keyfile, &len))) { - nm_log_err (LOGD_CORE, "Could not load groups from " CKDB_PATH); + _LOGE ("could not load groups from " CKDB_PATH); goto out; } @@ -171,7 +181,7 @@ ck_load_cache (GHashTable *cache) finished = TRUE; out: if (error) - nm_log_err (LOGD_CORE, "ConsoleKit: Failed to load database: %s", error->message); + _LOGE ("failed to load ConsoleKit database: %s", error->message); g_clear_error (&error); g_clear_pointer (&groups, g_strfreev); g_clear_pointer (&keyfile, g_key_file_free); @@ -189,7 +199,7 @@ ck_update_cache (NMSessionMonitor *monitor) /* Check the database file */ if (stat (CKDB_PATH, &statbuf) != 0) { - nm_log_err (LOGD_CORE, "Failed to check ConsoleKit timestamp: %s", strerror (errno)); + _LOGE ("failed to check ConsoleKit timestamp: %s", strerror (errno)); return FALSE; } if (statbuf.st_mtime == monitor->ck.timestamp) @@ -246,7 +256,7 @@ ck_init (NMSessionMonitor *monitor) G_CALLBACK (ck_changed), monitor); } else { - nm_log_err (LOGD_CORE, "Error monitoring " CKDB_PATH ": %s", error->message); + _LOGE ("error monitoring " CKDB_PATH ": %s", error->message); g_clear_error (&error); } } @@ -349,11 +359,17 @@ nm_session_monitor_session_exists (NMSessionMonitor *self, static void nm_session_monitor_init (NMSessionMonitor *monitor) { + const char *method = "no"; + #if defined (SESSION_TRACKING_SYSTEMD) st_sd_init (monitor); + method = "systemd-logind"; #elif defined (SESSION_TRACKING_CONSOLEKIT) ck_init (monitor); + method = "ConsoleKit"; #endif + + _LOGD ("using %s session tracking", method); } static void |