summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2015-07-26 11:48:05 +0200
committerThomas Haller <thaller@redhat.com>2015-08-05 14:40:41 +0200
commit831ffa2c56fbfcd20aebdc02faea42700c56862d (patch)
tree30005dc79f78c59ca97b012291d2ebec09b701c6
parent7c169cd5d974c9fbabd40749d9ab5890aa2a4faf (diff)
downloadNetworkManager-831ffa2c56fbfcd20aebdc02faea42700c56862d.tar.gz
core: log setup of singleton instances
-rw-r--r--src/nm-auth-manager.c2
-rw-r--r--src/nm-bus-manager.c2
-rw-r--r--src/nm-config.c7
-rw-r--r--src/platform/nm-platform.c2
4 files changed, 10 insertions, 3 deletions
diff --git a/src/nm-auth-manager.c b/src/nm-auth-manager.c
index 298bc096fe..998ffb1ec7 100644
--- a/src/nm-auth-manager.c
+++ b/src/nm-auth-manager.c
@@ -500,6 +500,8 @@ nm_auth_manager_setup (gboolean polkit_enabled)
singleton_instance = self;
nm_singleton_instance_register ();
+ nm_log_dbg (LOGD_CORE, "setup %s singleton (%p)", "NMAuthManager", singleton_instance);
+
return self;
}
diff --git a/src/nm-bus-manager.c b/src/nm-bus-manager.c
index e604746c18..66c117ef21 100644
--- a/src/nm-bus-manager.c
+++ b/src/nm-bus-manager.c
@@ -103,7 +103,7 @@ nm_bus_manager_setup (NMBusManager *instance)
already_setup = TRUE;
singleton_instance = instance;
nm_singleton_instance_register ();
- nm_log_dbg (LOGD_CORE, "create %s singleton (%p)", "NMBusManager", singleton_instance);
+ nm_log_dbg (LOGD_CORE, "setup %s singleton (%p)", "NMBusManager", singleton_instance);
}
/**************************************************************/
diff --git a/src/nm-config.c b/src/nm-config.c
index 71ff69be57..be04f163c6 100644
--- a/src/nm-config.c
+++ b/src/nm-config.c
@@ -1686,8 +1686,13 @@ nm_config_setup (const NMConfigCmdLineOptions *cli, char **atomic_section_prefix
g_assert (!singleton_instance);
singleton_instance = nm_config_new (cli, atomic_section_prefixes, error);
- if (singleton_instance)
+ if (singleton_instance) {
nm_singleton_instance_register ();
+
+ /* usually, you would not see this logging line because when creating the
+ * NMConfig instance, the logging is not yet set up to print debug message. */
+ nm_log_dbg (LOGD_CORE, "setup %s singleton (%p)", "NMConfig", singleton_instance);
+ }
return singleton_instance;
}
diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
index 6af39050ee..fad81351a9 100644
--- a/src/platform/nm-platform.c
+++ b/src/platform/nm-platform.c
@@ -161,7 +161,7 @@ nm_platform_setup (NMPlatform *instance)
* NMPlatform. */
g_object_ref (instance);
- nm_log_dbg (LOGD_CORE, "setup NMPlatform singleton (%p, %s)", instance, G_OBJECT_TYPE_NAME (instance));
+ nm_log_dbg (LOGD_CORE, "setup %s singleton (%p, %s)", "NMPlatform", singleton_instance, G_OBJECT_TYPE_NAME (instance));
}
/**