diff --git a/man/NetworkManager.conf.5.in b/man/NetworkManager.conf.5.in index ba575c941..a4777cbb9 100644 --- a/man/NetworkManager.conf.5.in +++ b/man/NetworkManager.conf.5.in @@ -160,9 +160,9 @@ warning messages. .B domains=\fI,, ...\fP The following log domains are available: [NONE, HW, RKILL, ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT, -USER_SET, SYS_SET, SUSPEND, CORE, DEVICE, OLPC]. When "NONE" is given by itself, +USER_SET, SETTINGS, SUSPEND, CORE, DEVICE, OLPC]. When "NONE" is given by itself, logging is disabled. MB = Mobile Broadband, USER_SET = user settings operations -and communication, SYS_SET = system settings service operations, OLPC = OLPC +and communication, SETTINGS = settings/config service operations, OLPC = OLPC Mesh device operations, CORE = core daemon operations, DEVICE = activation and general interface operations. .SH "SEE ALSO" diff --git a/src/logging/nm-logging.c b/src/logging/nm-logging.c index 5b5622fd7..5d804f90d 100644 --- a/src/logging/nm-logging.c +++ b/src/logging/nm-logging.c @@ -42,7 +42,7 @@ static guint32 log_domains = \ LOGD_HW | LOGD_RFKILL | LOGD_ETHER | LOGD_WIFI | LOGD_BT | LOGD_MB | \ LOGD_DHCP4 | LOGD_DHCP6 | LOGD_PPP | LOGD_IP4 | LOGD_IP6 | LOGD_AUTOIP4 | \ LOGD_DNS | LOGD_VPN | LOGD_SHARING | LOGD_SUPPLICANT | LOGD_USER_SET | \ - LOGD_SYS_SET | LOGD_SUSPEND | LOGD_CORE | LOGD_DEVICE | LOGD_OLPC_MESH; + LOGD_SETTINGS | LOGD_SUSPEND | LOGD_CORE | LOGD_DEVICE | LOGD_OLPC_MESH; typedef struct { guint32 num; @@ -77,7 +77,7 @@ static const LogDesc domain_descs[] = { { LOGD_SHARING, "SHARING" }, { LOGD_SUPPLICANT,"SUPPLICANT" }, { LOGD_USER_SET, "USER_SET" }, - { LOGD_SYS_SET, "SYS_SET" }, + { LOGD_SETTINGS, "SETTINGS" }, { LOGD_SUSPEND, "SUSPEND" }, { LOGD_CORE, "CORE" }, { LOGD_DEVICE, "DEVICE" }, diff --git a/src/logging/nm-logging.h b/src/logging/nm-logging.h index e4abcf75c..5e1d050b4 100644 --- a/src/logging/nm-logging.h +++ b/src/logging/nm-logging.h @@ -46,7 +46,7 @@ enum { LOGD_SHARING = 0x00008000, /* Connection sharing/dnsmasq */ LOGD_SUPPLICANT = 0x00010000, /* WiFi and 802.1x */ LOGD_USER_SET = 0x00020000, /* User settings */ - LOGD_SYS_SET = 0x00040000, /* System settings */ + LOGD_SETTINGS = 0x00040000, /* Settings */ LOGD_SUSPEND = 0x00080000, /* Suspend/Resume */ LOGD_CORE = 0x00100000, /* Core daemon and policy stuff */ LOGD_DEVICE = 0x00200000, /* Device state and activation */ diff --git a/src/nm-session-monitor.c b/src/nm-session-monitor.c index 0fdaa0fb8..a70067a98 100644 --- a/src/nm-session-monitor.c +++ b/src/nm-session-monitor.c @@ -323,7 +323,7 @@ nm_session_monitor_init (NMSessionMonitor *self) error = NULL; if (!ensure_database (self, &error)) { - nm_log_err (LOGD_SYS_SET, "Error loading " CKDB_PATH ": %s", error->message); + nm_log_err (LOGD_CORE, "Error loading " CKDB_PATH ": %s", error->message); g_error_free (error); } @@ -332,7 +332,7 @@ nm_session_monitor_init (NMSessionMonitor *self) self->database_monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL, &error); g_object_unref (file); if (self->database_monitor == NULL) { - nm_log_err (LOGD_SYS_SET, "Error monitoring " CKDB_PATH ": %s", error->message); + nm_log_err (LOGD_CORE, "Error monitoring " CKDB_PATH ": %s", error->message); g_error_free (error); } else { g_signal_connect (self->database_monitor, diff --git a/src/settings/nm-inotify-helper.c b/src/settings/nm-inotify-helper.c index 0ee168e54..f44fee823 100644 --- a/src/settings/nm-inotify-helper.c +++ b/src/settings/nm-inotify-helper.c @@ -123,14 +123,14 @@ init_inotify (NMInotifyHelper *self) priv->ifd = inotify_init (); if (priv->ifd == -1) { - nm_log_warn (LOGD_SYS_SET, "couldn't initialize inotify"); + nm_log_warn (LOGD_SETTINGS, "couldn't initialize inotify"); return FALSE; } /* Watch the inotify descriptor for file/directory change events */ channel = g_io_channel_unix_new (priv->ifd); if (!channel) { - nm_log_warn (LOGD_SYS_SET, "couldn't create new GIOChannel"); + nm_log_warn (LOGD_SETTINGS, "couldn't create new GIOChannel"); close (priv->ifd); priv->ifd = -1; return FALSE; diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index d00595240..7c2e7c2c2 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -471,7 +471,7 @@ add_plugin (NMSettings *self, NMSystemConfigInterface *plugin) g_signal_connect (plugin, NM_SYSTEM_CONFIG_INTERFACE_UNMANAGED_SPECS_CHANGED, G_CALLBACK (unmanaged_specs_changed), self); - nm_log_info (LOGD_SYS_SET, "Loaded plugin %s: %s", pname, pinfo); + nm_log_info (LOGD_SETTINGS, "Loaded plugin %s: %s", pname, pinfo); g_free (pname); g_free (pinfo); } @@ -666,7 +666,7 @@ claim_connection (NMSettings *self, } if (!nm_connection_verify (NM_CONNECTION (connection), &error)) { - nm_log_warn (LOGD_SYS_SET, "plugin provided invalid connection: '%s' / '%s' invalid: %d", + nm_log_warn (LOGD_SETTINGS, "plugin provided invalid connection: '%s' / '%s' invalid: %d", g_type_name (nm_connection_lookup_setting_type_by_quark (error->domain)), error->message, error->code); g_error_free (error); @@ -1043,7 +1043,7 @@ is_mac_auto_wired_blacklisted (NMSettings *self, const GByteArray *mac) config = g_key_file_new (); if (!config) { - nm_log_warn (LOGD_SYS_SET, "not enough memory to load config file."); + nm_log_warn (LOGD_SETTINGS, "not enough memory to load config file."); return FALSE; } @@ -1208,11 +1208,11 @@ default_wired_try_update (NMDefaultWiredConnection *wired, g_object_set_data (G_OBJECT (nm_default_wired_connection_get_device (wired)), DEFAULT_WIRED_TAG, NULL); - nm_log_info (LOGD_SYS_SET, "Saved default wired connection '%s' to persistent storage", id); + nm_log_info (LOGD_SETTINGS, "Saved default wired connection '%s' to persistent storage", id); return FALSE; } - nm_log_warn (LOGD_SYS_SET, "couldn't save default wired connection '%s': %d / %s", + nm_log_warn (LOGD_SETTINGS, "couldn't save default wired connection '%s': %d / %s", id, error ? error->code : -1, (error && error->message) ? error->message : "(unknown)"); @@ -1268,7 +1268,7 @@ nm_settings_device_added (NMSettings *self, NMDevice *device) id = nm_setting_connection_get_id (s_con); g_assert (id); - nm_log_info (LOGD_SYS_SET, "Added default wired connection '%s' for %s", + nm_log_info (LOGD_SETTINGS, "Added default wired connection '%s' for %s", id, nm_device_get_udi (device)); g_signal_connect (wired, "try-update", (GCallback) default_wired_try_update, self); @@ -1338,7 +1338,7 @@ nm_settings_init (NMSettings *self) priv->authority = polkit_authority_get_sync (NULL, &error); if (!priv->authority) { - nm_log_warn (LOGD_SYS_SET, "failed to create PolicyKit authority: (%d) %s", + nm_log_warn (LOGD_SETTINGS, "failed to create PolicyKit authority: (%d) %s", error ? error->code : -1, error && error->message ? error->message : "(unknown)"); g_clear_error (&error); diff --git a/src/settings/nm-sysconfig-connection.c b/src/settings/nm-sysconfig-connection.c index 678c51f8e..ebbca95fa 100644 --- a/src/settings/nm-sysconfig-connection.c +++ b/src/settings/nm-sysconfig-connection.c @@ -841,7 +841,7 @@ nm_sysconfig_connection_init (NMSysconfigConnection *self) priv->authority = polkit_authority_get_sync (NULL, NULL); if (!priv->authority) { - nm_log_warn (LOGD_SYS_SET, "failed to create PolicyKit authority: (%d) %s", + nm_log_warn (LOGD_SETTINGS, "failed to create PolicyKit authority: (%d) %s", error ? error->code : -1, error && error->message ? error->message : "(unknown)"); g_clear_error (&error);