Add null logging handler and fix log override chec

davidbyttow · Dec 20, 2020 · cd7a815 · cd7a815
1 parent 1cec7b1
commit cd7a815
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/vips/govips.c b/vips/govips.c
@@ -7,12 +7,18 @@ static void govips_logging_handler(
   govipsLoggingHandler((char *)log_domain, (int)log_level, (char *)message);
 }
 
+static void null_logging_handler(
+    const gchar *log_domain, GLogLevelFlags log_level,
+    const gchar *message, gpointer user_data)
+{
+}
+
 void vips_set_logging_handler(void)
 {
   g_log_set_default_handler(govips_logging_handler, NULL);
 }
 
 void vips_unset_logging_handler(void)
 {
-  g_log_set_default_handler(NULL, NULL);
+  g_log_set_default_handler(null_logging_handler, NULL);
 }
diff --git a/vips/govips.go b/vips/govips.go
@@ -86,6 +86,7 @@ func Startup(config *Config) {
 	// Initialize govips logging handler and verbosity filter to historical default
 	if !currentLoggingOverridden {
 		LoggingSettings(nil, LogLevelInfo)
+		currentLoggingOverridden = false
 	}
 
 	// Override default glib logging handler to intercept logging messages

diff --git a/vips/govips.h b/vips/govips.h
@@ -13,5 +13,9 @@ static void govips_logging_handler(
     const gchar *log_domain, GLogLevelFlags log_level,
     const gchar *message, gpointer user_data);
 
+static void null_logging_handler(
+    const gchar *log_domain, GLogLevelFlags log_level,
+    const gchar *message, gpointer user_data);
+
 void vips_set_logging_handler(void);
 void vips_unset_logging_handler(void);