colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: consolidate logging format in main daemon logic

Browse Source
This commit is contained in:
Aleksander Morgado
2020-04-08 10:11:50 +02:00
parent 4508c11796
commit f1e930d574
1 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main.c
View File

@@ -43,7 +43,7 @@ static MMBaseManager *manager;
static gboolean static gboolean
quit_cb (gpointer user_data) quit_cb (gpointer user_data)
{ {
mm_info ("Caught signal, shutting down..."); mm_info ("caught signal, shutting down...");
if (manager) if (manager)
g_object_set (manager, MM_BASE_MANAGER_CONNECTION, NULL, NULL); g_object_set (manager, MM_BASE_MANAGER_CONNECTION, NULL, NULL);
@@ -60,14 +60,14 @@ quit_cb (gpointer user_data)
static void static void
sleeping_cb (MMSleepMonitor *sleep_monitor) sleeping_cb (MMSleepMonitor *sleep_monitor)
{ {
mm_dbg ("Removing devices... (sleeping)"); mm_dbg ("removing devices... (sleeping)");
mm_base_manager_shutdown (manager, FALSE); mm_base_manager_shutdown (manager, FALSE);
} }
static void static void
resuming_cb (MMSleepMonitor *sleep_monitor) resuming_cb (MMSleepMonitor *sleep_monitor)
{ {
mm_dbg ("Re-scanning (resuming)"); mm_dbg ("re-scanning (resuming)");
mm_base_manager_start (manager, FALSE); mm_base_manager_start (manager, FALSE);
} }
@@ -80,7 +80,7 @@ bus_acquired_cb (GDBusConnection *connection,
{ {
GError *error = NULL; GError *error = NULL;
mm_dbg ("Bus acquired, creating manager..."); mm_dbg ("bus acquired, creating manager...");
/* Create Manager object */ /* Create Manager object */
g_assert (!manager); g_assert (!manager);
@@ -92,7 +92,7 @@ bus_acquired_cb (GDBusConnection *connection,
mm_context_get_test_enable (), mm_context_get_test_enable (),
&error); &error);
if (!manager) { if (!manager) {
mm_warn ("Could not create manager: %s", error->message); mm_warn ("could not create manager: %s", error->message);
g_error_free (error); g_error_free (error);
g_main_loop_quit (loop); g_main_loop_quit (loop);
return; return;
@@ -104,7 +104,7 @@ name_acquired_cb (GDBusConnection *connection,
const gchar *name, const gchar *name,
gpointer user_data) gpointer user_data)
{ {
mm_dbg ("Service name '%s' was acquired", name); mm_dbg ("service name '%s' was acquired", name);
/* Launch automatic scan for devices */ /* Launch automatic scan for devices */
g_assert (manager); g_assert (manager);
@@ -119,10 +119,9 @@ name_lost_cb (GDBusConnection *connection,
/* Note that we're not allowing replacement, so once the name acquired, the /* Note that we're not allowing replacement, so once the name acquired, the
* process won't lose it. */ * process won't lose it. */
if (!name) if (!name)
mm_warn ("Could not get the system bus. Make sure " mm_warn ("could not get the system bus; make sure the message bus daemon is running!");
"the message bus daemon is running!");
else else
mm_warn ("Could not acquire the '%s' service name", name); mm_warn ("could not acquire the '%s' service name", name);
if (manager) if (manager)
g_object_set (manager, MM_BASE_MANAGER_CONNECTION, NULL, NULL); g_object_set (manager, MM_BASE_MANAGER_CONNECTION, NULL, NULL);
@@ -156,7 +155,7 @@ int
main (int argc, char *argv[]) main (int argc, char *argv[])
{ {
GMainLoop *inner; GMainLoop *inner;
GError *err = NULL; GError *error = NULL;
guint name_id; guint name_id;
/* Setup application context */ /* Setup application context */
@@ -167,9 +166,9 @@ main (int argc, char *argv[])
mm_context_get_log_journal (), mm_context_get_log_journal (),
mm_context_get_log_timestamps (), mm_context_get_log_timestamps (),
mm_context_get_log_relative_timestamps (), mm_context_get_log_relative_timestamps (),
&err)) { &error)) {
g_warning ("Failed to set up logging: %s", err->message); g_warning ("failed to set up logging: %s", error->message);
g_error_free (err); g_error_free (error);
exit (1); exit (1);
} }
@@ -228,8 +227,7 @@ main (int argc, char *argv[])
} }
if (mm_base_manager_num_modems (manager)) if (mm_base_manager_num_modems (manager))
mm_warn ("Disabling modems took too long, " mm_warn ("disabling modems took too long, shutting down with %u modems around",
"shutting down with '%u' modems around",
mm_base_manager_num_modems (manager)); mm_base_manager_num_modems (manager));
g_object_unref (manager); g_object_unref (manager);