From ea584acf200b1ec174fe7d0e6b22016a88930772 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 14 Dec 2022 15:02:19 +0000 Subject: [PATCH] daemons: Treat g_info() as equivalent to g_debug() Same as the previous commit, but for anything that runs in the background. Signed-off-by: Simon McVittie --- oci-authenticator/flatpak-oci-authenticator.c | 4 ++-- portal/flatpak-portal.c | 4 ++-- session-helper/flatpak-session-helper.c | 4 ++-- system-helper/flatpak-system-helper.c | 8 ++++---- tests/test-authenticator.c | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/oci-authenticator/flatpak-oci-authenticator.c b/oci-authenticator/flatpak-oci-authenticator.c index 7a0b99be..7d202aa6 100644 --- a/oci-authenticator/flatpak-oci-authenticator.c +++ b/oci-authenticator/flatpak-oci-authenticator.c @@ -692,7 +692,7 @@ message_handler (const gchar *log_domain, gpointer user_data) { /* Make this look like normal console output */ - if (log_level & G_LOG_LEVEL_DEBUG) + if (log_level & (G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_INFO)) g_printerr ("F: %s\n", message); else g_printerr ("%s: %s\n", g_get_prgname (), message); @@ -765,7 +765,7 @@ main (int argc, } if (opt_verbose) - g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, message_handler, NULL); + g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_INFO, message_handler, NULL); g_debug ("Started flatpak-authenticator"); diff --git a/portal/flatpak-portal.c b/portal/flatpak-portal.c index 55273a75..6e33fe73 100644 --- a/portal/flatpak-portal.c +++ b/portal/flatpak-portal.c @@ -2967,7 +2967,7 @@ message_handler (const gchar *log_domain, gpointer user_data) { /* Make this look like normal console output */ - if (log_level & G_LOG_LEVEL_DEBUG) + if (log_level & (G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_INFO)) g_printerr ("F: %s\n", message); else g_printerr ("%s: %s\n", g_get_prgname (), message); @@ -3037,7 +3037,7 @@ main (int argc, } if (opt_verbose) - g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, message_handler, NULL); + g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_INFO, message_handler, NULL); client_pid_data_hash = g_hash_table_new_full (NULL, NULL, NULL, (GDestroyNotify) pid_data_free); diff --git a/session-helper/flatpak-session-helper.c b/session-helper/flatpak-session-helper.c index 50ee0439..04e9d77e 100644 --- a/session-helper/flatpak-session-helper.c +++ b/session-helper/flatpak-session-helper.c @@ -680,7 +680,7 @@ message_handler (const gchar *log_domain, gpointer user_data) { /* Make this look like normal console output */ - if (log_level & G_LOG_LEVEL_DEBUG) + if (log_level & (G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_INFO)) g_printerr ("F: %s\n", message); else g_printerr ("%s: %s\n", g_get_prgname (), message); @@ -826,7 +826,7 @@ main (int argc, } if (verbose) - g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, message_handler, NULL); + g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_INFO, message_handler, NULL); client_pid_data_hash = g_hash_table_new_full (NULL, NULL, NULL, (GDestroyNotify) pid_data_free); diff --git a/system-helper/flatpak-system-helper.c b/system-helper/flatpak-system-helper.c index 31f61950..d637b1a2 100644 --- a/system-helper/flatpak-system-helper.c +++ b/system-helper/flatpak-system-helper.c @@ -2289,7 +2289,7 @@ message_handler (const gchar *log_domain, gpointer user_data) { /* Make this look like normal console output */ - if (log_level & G_LOG_LEVEL_DEBUG) + if (log_level & (G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_INFO)) g_printerr ("FH: %s\n", message); else g_printerr ("%s: %s\n", g_get_prgname (), message); @@ -2373,12 +2373,12 @@ main (int argc, flatpak_disable_fancy_output (); if (opt_verbose > 0) - g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, message_handler, NULL); + g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_INFO, message_handler, NULL); if (opt_verbose > 1) - g_log_set_handler (G_LOG_DOMAIN "2", G_LOG_LEVEL_DEBUG, message_handler, NULL); + g_log_set_handler (G_LOG_DOMAIN "2", G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_INFO, message_handler, NULL); if (opt_ostree_verbose) - g_log_set_handler ("OSTree", G_LOG_LEVEL_DEBUG, message_handler, NULL); + g_log_set_handler ("OSTree", G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_INFO, message_handler, NULL); if (!on_session_bus) { diff --git a/tests/test-authenticator.c b/tests/test-authenticator.c index 031413d9..f6b6aa72 100644 --- a/tests/test-authenticator.c +++ b/tests/test-authenticator.c @@ -322,7 +322,7 @@ message_handler (const gchar *log_domain, gpointer user_data) { /* Make this look like normal console output */ - if (log_level & G_LOG_LEVEL_DEBUG) + if (log_level & (G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_INFO)) g_printerr ("F: %s\n", message); else g_printerr ("%s: %s\n", g_get_prgname (), message); @@ -372,7 +372,7 @@ main (int argc, } if (opt_verbose) - g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, message_handler, NULL); + g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG | G_LOG_LEVEL_INFO, message_handler, NULL); g_debug ("Started test-authenticator");