fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-03 10:10:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

session-monitor: use logging macros

Browse source 
Use logging macros and also, print the session tracking method during
startup for debugging purposes.
This commit is contained in:
Beniamino Galvani 2016-10-11 14:07:24 +02:00
parent 45c0518a5e
commit 0e7f834a6f
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/nm-session-monitor.c
View file

@ -68,6 +68,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
/*****************************************************************************/
#ifdef SESSION_TRACKING_SYSTEMD
@ -82,8 +93,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;
}
@ -110,7 +120,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;
}
@ -148,7 +158,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;
}
@ -175,7 +185,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);
@ -193,7 +203,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)
@ -250,7 +260,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);
}
}
@ -355,10 +365,12 @@ nm_session_monitor_init (NMSessionMonitor *monitor)
{
#ifdef SESSION_TRACKING_SYSTEMD
st_sd_init (monitor);
_LOGD ("using systemd-logind session tracking");
#endif
#ifdef SESSION_TRACKING_CONSOLEKIT
ck_init (monitor);
_LOGD ("using ConsoleKit session tracking");
#endif
}