Improve logging code

Author: bynect

config.mk

@@ -55,7 +55,7 @@ DEFAULT_CPPFLAGS = -Wno-gnu-zero-variadic-macro-arguments -D_DEFAULT_SOURCE -DVE
 DEFAULT_CFLAGS   = -g -std=gnu11 -pedantic -Wall -Wno-overlength-strings -Os ${EXTRA_CFLAGS}
 DEFAULT_LDFLAGS  = -lm -lrt
 
-CPPFLAGS_DEBUG := -DDEBUG_BUILD
+CPPFLAGS_DEBUG :=
 CFLAGS_DEBUG   := -O0
 LDFLAGS_DEBUG  :=
 

src/dunst.c

@@ -251,7 +251,7 @@ int dunst_main(int argc, char *argv[])
 
         cmdline_load(argc, argv);
 
-        dunst_log_init(false);
+        dunst_log_init(DUNST_LOG_AUTO);
 
         if (cmdline_get_bool("-v/-version/--version", false, "Print version")) {
                 print_version();

src/log.c

@@ -14,17 +14,19 @@
 // NOTE: Keep updated with the dunst manual
 static GLogLevelFlags log_level = G_LOG_LEVEL_MESSAGE;
 
+static enum log_mask log_mask = DUNST_LOG_AUTO;
+
 /* see log.h */
 static const char *log_level_to_string(GLogLevelFlags level)
 {
         switch (level) {
-        case G_LOG_LEVEL_ERROR: return "ERROR";
-        case G_LOG_LEVEL_CRITICAL: return "CRITICAL";
-        case G_LOG_LEVEL_WARNING: return "WARNING";
-        case G_LOG_LEVEL_MESSAGE: return "MESSAGE";
-        case G_LOG_LEVEL_INFO: return "INFO";
-        case G_LOG_LEVEL_DEBUG: return "DEBUG";
-        default: return "UNKNOWN";
+                case G_LOG_LEVEL_ERROR: return "ERROR";
+                case G_LOG_LEVEL_CRITICAL: return "CRITICAL";
+                case G_LOG_LEVEL_WARNING: return "WARNING";
+                case G_LOG_LEVEL_MESSAGE: return "MESSAGE";
+                case G_LOG_LEVEL_INFO: return "INFO";
+                case G_LOG_LEVEL_DEBUG: return "DEBUG";
+                default: return "UNKNOWN";
         }
 }
 
@@ -66,27 +68,22 @@ void log_set_level(GLogLevelFlags level)
  * @param log_domain Used only by GLib
  * @param message_level Used only by GLib
  * @param message Used only by GLib
- * @param testing If not `NULL` (here: `true`), do nothing
+ * @param ignore
  */
 static void dunst_log_handler(
                 const gchar    *log_domain,
                 GLogLevelFlags  message_level,
                 const gchar    *message,
-                gpointer        testing)
+                gpointer        ignore)
 {
         (void)log_domain;
 
-        if (testing)
-                log_level = G_LOG_LEVEL_ERROR;
-
         GLogLevelFlags message_level_masked = message_level & G_LOG_LEVEL_MASK;
 
-/* if you want to have a debug build, you want to log anything,
- * unconditionally, without specifying debug log level again */
-#ifndef DEBUG_BUILD
-        if (log_level < message_level_masked)
+        if (log_mask == DUNST_LOG_NONE ||
+            (log_mask == DUNST_LOG_AUTO && log_level < message_level_masked))
                 return;
-#endif
+
         const char *log_level_str =
                 log_level_to_string(message_level_masked);
 
@@ -98,9 +95,10 @@ static void dunst_log_handler(
 }
 
 /* see log.h */
-void dunst_log_init(bool testing)
+void dunst_log_init(enum log_mask mask)
 {
-        g_log_set_default_handler(dunst_log_handler, (void*)testing);
+        log_mask = mask;
+        g_log_set_default_handler(dunst_log_handler, NULL);
 }
 
 /* vim: set ft=c tabstop=8 shiftwidth=8 expandtab textwidth=0: */

src/log.h

@@ -46,6 +46,12 @@
 #define MSG_FOPEN_SUCCESS(path, fp) "Opened '%s' (fd: '%d')", path, fileno(fp)
 #define MSG_FOPEN_FAILURE(path) "Cannot open '%s': %s", path, strerror(errno)
 
+enum log_mask {
+        DUNST_LOG_NONE,
+        DUNST_LOG_ALL,
+        DUNST_LOG_AUTO,
+};
+
 /**
  * Set the current loglevel to `level`
  *
@@ -69,10 +75,10 @@ void log_set_level_from_string(const char* level);
 /**
  * Initialise log handling. Can be called any time.
  *
- * @param testing If we're in testing mode and should
- *                suppress all output
+ * @param mask If we're in testing mode and should
+ *                suppress all output or show all
  */
-void dunst_log_init(bool testing);
+void dunst_log_init(enum log_mask mask);
 
 #endif
 /* vim: set ft=c tabstop=8 shiftwidth=8 expandtab textwidth=0: */

test/test.c

@@ -37,11 +37,10 @@ int main(int argc, char *argv[]) {
         base = realpath(base ? base : "./test", NULL);
 
         /* By default do not print out warning messages, when executing tests.
-         * But allow, if DUNST_TEST_LOG=1 is set in environment. */
+         * But if DUNST_TEST_LOG=1 is set in environment, print everything. */
         const char *log = getenv("DUNST_TEST_LOG");
-        bool printlog = log && atoi(log) ? true : false;
-        dunst_log_init(!printlog);
-
+        enum log_mask printlog = (log && atoi(log)) ? DUNST_LOG_ALL : DUNST_LOG_NONE;
+        dunst_log_init(printlog);
 
         // initialize settings
         char **configs = g_malloc0(2 * sizeof(char *));