Fix verbose/debug logging, add G_LOG_DOMAIN for easier tracking

in journalctl. Verbose mode was broken for gtk-based daemons, as post-gtk_init is too late to set G_MESSAGES_DEBUG.
linuxmint · Nov 7, 2024 · f09f592 · f09f592
1 parent a690627
commit f09f592
Show file tree

Hide file tree

Showing 18 changed files with 45 additions and 5 deletions.
diff --git a/plugins/a11y-settings/meson.build b/plugins/a11y-settings/meson.build
@@ -17,6 +17,7 @@ executable(
     include_directories: [include_dirs, common_inc],
     dependencies: a11y_settings_deps,
     c_args: [
+        '-DG_LOG_DOMAIN="csd-@0@"'.format(plugin_name),
         '-DPLUGIN_NAME="@0@"'.format(plugin_name),
     ],
     install: true,

diff --git a/plugins/automount/meson.build b/plugins/automount/meson.build
@@ -18,6 +18,7 @@ executable(
     include_directories: [include_dirs, common_inc],
     dependencies: automount_deps,
     c_args: [
+        '-DG_LOG_DOMAIN="csd-@0@"'.format(plugin_name),
         '-DPLUGIN_NAME="@0@"'.format(plugin_name),
     ],
     install_rpath: join_paths(prefix, apilibdir),

diff --git a/plugins/background/meson.build b/plugins/background/meson.build
@@ -19,6 +19,7 @@ executable(
     include_directories: [include_dirs, common_inc],
     dependencies: background_deps,
     c_args: [
+        '-DG_LOG_DOMAIN="csd-@0@"'.format(plugin_name),
         '-DPLUGIN_NAME="@0@"'.format(plugin_name),
     ],
     install: true,

diff --git a/plugins/clipboard/meson.build b/plugins/clipboard/meson.build
@@ -19,6 +19,7 @@ executable(
     include_directories: [include_dirs, common_inc],
     dependencies: clipboard_deps,
     c_args: [
+        '-DG_LOG_DOMAIN="csd-@0@"'.format(plugin_name),
         '-DPLUGIN_NAME="@0@"'.format(plugin_name),
     ],
     install: true,

diff --git a/plugins/color/meson.build b/plugins/color/meson.build
@@ -37,6 +37,7 @@ executable(
   dependencies: color_deps,
   c_args: [
       '-DPLUGIN_NAME="@0@"'.format(plugin_name),
+      '-DG_LOG_DOMAIN="csd-@0@"'.format(plugin_name),
       '-DBINDIR="@0@"'.format(bindir),
   ],
   install: true,

diff --git a/plugins/common/daemon-skeleton-gtk.h b/plugins/common/daemon-skeleton-gtk.h
@@ -174,6 +174,19 @@ handle_signal (gpointer user_data)
   return G_SOURCE_REMOVE;
 }
 
+static void
+message_handler (const gchar *log_domain,
+                 GLogLevelFlags log_level,
+                 const gchar *message,
+                 gpointer user_data)
+{
+  /* Make this look like normal console output */
+  if (log_level & G_LOG_LEVEL_DEBUG)
+    printf ("csd-%s: %s\n", PLUGIN_NAME, message);
+  else
+    printf ("%s: %s\n", g_get_prgname (), message);
+}
+
 int
 main (int argc, char **argv)
 {
@@ -221,7 +234,7 @@ main (int argc, char **argv)
         g_unix_signal_add (SIGTERM, (GSourceFunc) handle_signal, NULL);
 
         if (verbose)
-                g_setenv ("G_MESSAGES_DEBUG", "all", TRUE);
+            g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, message_handler, NULL);
 
         if (timeout > 0) {
                 guint id;

diff --git a/plugins/common/daemon-skeleton.h b/plugins/common/daemon-skeleton.h
@@ -171,6 +171,19 @@ handle_signal (gpointer user_data)
     return G_SOURCE_REMOVE;
 }
 
+static void
+message_handler (const gchar *log_domain,
+                 GLogLevelFlags log_level,
+                 const gchar *message,
+                 gpointer user_data)
+{
+  /* Make this look like normal console output */
+  if (log_level & G_LOG_LEVEL_DEBUG)
+    printf ("csd-%s: %s\n", PLUGIN_NAME, message);
+  else
+    printf ("%s: %s\n", g_get_prgname (), message);
+}
+
 int
 main (int argc, char **argv)
 {
@@ -208,10 +221,8 @@ main (int argc, char **argv)
 
         g_unix_signal_add (SIGTERM, (GSourceFunc) handle_signal, loop);
 
-        if (verbose) {
-                g_setenv ("G_MESSAGES_DEBUG", "all", TRUE);
-                setlinebuf (stdout);
-        }
+        if (verbose)
+            g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, message_handler, NULL);
 
         if (timeout > 0) {
                 guint id;

diff --git a/plugins/datetime/meson.build b/plugins/datetime/meson.build
@@ -47,6 +47,7 @@ if polkit.found()
         include_directories: [include_dirs, common_inc],
         dependencies: datetime_deps,
         c_args: [
+            '-DG_LOG_DOMAIN="csd-@0@"'.format(plugin_name),
             '-DPLUGIN_NAME="@0@"'.format(plugin_name),
         ],
         install: true,

diff --git a/plugins/housekeeping/meson.build b/plugins/housekeeping/meson.build
@@ -25,6 +25,7 @@ executable(
     include_directories: [include_dirs, common_inc],
     dependencies: housekeeping_deps,
     c_args: [
+        '-DG_LOG_DOMAIN="csd-@0@"'.format(plugin_name),
         '-DPLUGIN_NAME="@0@"'.format(plugin_name),
     ],
     install: true,

diff --git a/plugins/keyboard/meson.build b/plugins/keyboard/meson.build
@@ -23,6 +23,7 @@ executable(
     include_directories: [include_dirs, common_inc, include_enums],
     dependencies: keyboard_deps,
     c_args: [
+        '-DG_LOG_DOMAIN="csd-@0@"'.format(plugin_name),
         '-DPLUGIN_NAME="@0@"'.format(plugin_name),
         '-DDATADIR="@0@"'.format(datadir),
     ],

diff --git a/plugins/media-keys/meson.build b/plugins/media-keys/meson.build
@@ -25,6 +25,7 @@ executable(
     include_directories: [include_dirs, common_inc, include_enums],
     dependencies: media_keys_deps,
     c_args: [
+        '-DG_LOG_DOMAIN="csd-@0@"'.format(plugin_name),
         '-DPLUGIN_NAME="@0@"'.format(plugin_name),
     ],
     install: true,

diff --git a/plugins/power/meson.build b/plugins/power/meson.build
@@ -61,6 +61,7 @@ executable(
     dependencies: power_deps,
     c_args: [
         '-DPLUGIN_NAME="@0@"'.format(plugin_name),
+        '-DG_LOG_DOMAIN="csd-@0@"'.format(plugin_name),
     ],
     install_rpath: join_paths(prefix, apilibdir),
     install: true,

diff --git a/plugins/print-notifications/meson.build b/plugins/print-notifications/meson.build
@@ -23,6 +23,7 @@ executable(
     include_directories: [include_dirs, common_inc],
     dependencies: print_notifications_deps,
     c_args: [
+        '-DG_LOG_DOMAIN="csd-@0@"'.format(plugin_name),
         '-DPLUGIN_NAME="@0@"'.format(plugin_name),
     ],
     install: true,

diff --git a/plugins/screensaver-proxy/meson.build b/plugins/screensaver-proxy/meson.build
@@ -17,6 +17,7 @@ executable(
     include_directories: [include_dirs, common_inc],
     dependencies: screensaver_proxy_deps,
     c_args: [
+        '-DG_LOG_DOMAIN="csd-@0@"'.format(plugin_name),
         '-DPLUGIN_NAME="@0@"'.format(plugin_name),
     ],
     install: true,

diff --git a/plugins/settings-remap/meson.build b/plugins/settings-remap/meson.build
@@ -16,6 +16,7 @@ executable(
     include_directories: [include_dirs, common_inc],
     dependencies: settings_remap_deps,
     c_args: [
+        '-DG_LOG_DOMAIN="csd-@0@"'.format(plugin_name),
         '-DPLUGIN_NAME="@0@"'.format(plugin_name),
     ],
     install: true,

diff --git a/plugins/smartcard/meson.build b/plugins/smartcard/meson.build
@@ -19,6 +19,7 @@ executable(
     include_directories: [include_dirs, common_inc],
     dependencies: smartcard_deps,
     c_args: [
+        '-DG_LOG_DOMAIN="csd-@0@"'.format(plugin_name),
         '-DPLUGIN_NAME="@0@"'.format(plugin_name),
     ],
     install: true,

diff --git a/plugins/wacom/meson.build b/plugins/wacom/meson.build
@@ -17,6 +17,7 @@ deps = [
 ]
 
 cflags = [
+  '-DG_LOG_DOMAIN="csd-@0@"'.format(plugin_name),
   '-DPLUGIN_NAME="@0@"'.format(plugin_name),
 ]
 

diff --git a/plugins/xsettings/meson.build b/plugins/xsettings/meson.build
@@ -32,6 +32,7 @@ executable(
     include_directories: [include_dirs, common_inc, include_enums],
     dependencies: xsettings_deps,
     c_args: [
+        '-DG_LOG_DOMAIN="csd-@0@"'.format(plugin_name),
         '-DPLUGIN_NAME="@0@"'.format(plugin_name),
         '-DGTK_MODULES_DIRECTORY="@0@/@1@/cinnamon-settings-daemon-@2@/gtk-modules/"'.format(prefix, libdir, api_version),
     ],