[tracker-miners/sam/uninstalled-tests-fix: 5/12] Move various log messages into TRACKER_DEBUG=config

[Sam Thursfield <sthursfield src gnome org>]

commit bf8ab65f2f07f038db16cf5da68daa9b8c4dc6b0
Author: Sam Thursfield <sam afuera me uk>
Date:   Sat Apr 25 16:37:03 2020 +0200

    Move various log messages into TRACKER_DEBUG=config

 src/miners/fs/tracker-main.c                    | 44 ++++++++++++++-----------
 src/tracker-extract/tracker-extract-decorator.c |  6 ++--
 src/tracker-extract/tracker-main.c              | 20 ++++++-----
 3 files changed, 39 insertions(+), 31 deletions(-)
---
diff --git a/src/miners/fs/tracker-main.c b/src/miners/fs/tracker-main.c
index 10196887c..5984db334 100644
--- a/src/miners/fs/tracker-main.c
+++ b/src/miners/fs/tracker-main.c
@@ -92,27 +92,31 @@ static GOptionEntry entries[] = {
 };
 
 static void
-sanity_check_option_values (TrackerConfig *config)
+log_option_values (TrackerConfig *config)
 {
-       g_message ("General options:");
-       g_message ("  Initial Sleep  ........................  %d",
-                  tracker_config_get_initial_sleep (config));
-       g_message ("  Writeback  ............................  %s",
-                  tracker_config_get_enable_writeback (config) ? "yes" : "no");
-
-       g_message ("Indexer options:");
-       g_message ("  Throttle level  .......................  %d",
-                  tracker_config_get_throttle (config));
-       g_message ("  Indexing while on battery  ............  %s (first time only = %s)",
-                  tracker_config_get_index_on_battery (config) ? "yes" : "no",
-                  tracker_config_get_index_on_battery_first_time (config) ? "yes" : "no");
-
-       if (tracker_config_get_low_disk_space_limit (config) == -1) {
-               g_message ("  Low disk space limit  .................  Disabled");
-       } else {
-               g_message ("  Low disk space limit  .................  %d%%",
-                          tracker_config_get_low_disk_space_limit (config));
+#ifdef G_ENABLE_DEBUG
+       if (TRACKER_DEBUG_CHECK (CONFIG)) {
+               g_message ("General options:");
+               g_message ("  Initial Sleep  ........................  %d",
+                          tracker_config_get_initial_sleep (config));
+               g_message ("  Writeback  ............................  %s",
+                          tracker_config_get_enable_writeback (config) ? "yes" : "no");
+
+               g_message ("Indexer options:");
+               g_message ("  Throttle level  .......................  %d",
+                          tracker_config_get_throttle (config));
+               g_message ("  Indexing while on battery  ............  %s (first time only = %s)",
+                          tracker_config_get_index_on_battery (config) ? "yes" : "no",
+                          tracker_config_get_index_on_battery_first_time (config) ? "yes" : "no");
+
+               if (tracker_config_get_low_disk_space_limit (config) == -1) {
+                       g_message ("  Low disk space limit  .................  Disabled");
+               } else {
+                       g_message ("  Low disk space limit  .................  %d%%",
+                                  tracker_config_get_low_disk_space_limit (config));
+               }
        }
+#endif
 }
 
 static void
@@ -854,7 +858,7 @@ main (gint argc, gchar *argv[])
                tracker_config_set_initial_sleep (config, initial_sleep);
        }
 
-       sanity_check_option_values (config);
+       log_option_values (config);
 
        main_loop = g_main_loop_new (NULL, FALSE);
 
diff --git a/src/tracker-extract/tracker-extract-decorator.c b/src/tracker-extract/tracker-extract-decorator.c
index 819b319ff..223389a63 100644
--- a/src/tracker-extract/tracker-extract-decorator.c
+++ b/src/tracker-extract/tracker-extract-decorator.c
@@ -349,8 +349,8 @@ tracker_extract_decorator_items_available (TrackerDecorator *decorator)
        TrackerExtractDecoratorPrivate *priv;
 
        priv = tracker_extract_decorator_get_instance_private (TRACKER_EXTRACT_DECORATOR (decorator));
-       g_message ("Starting to process %d items",
-                  tracker_decorator_get_n_items (decorator));
+       g_debug ("Starting to process %d items",
+                tracker_decorator_get_n_items (decorator));
 
        priv->timer = g_timer_new ();
        if (tracker_miner_is_paused (TRACKER_MINER (decorator)))
@@ -373,7 +373,7 @@ tracker_extract_decorator_finished (TrackerDecorator *decorator)
        }
 
        time_str = tracker_seconds_to_string (elapsed, TRUE);
-       g_message ("Extraction finished in %s", time_str);
+       g_debug ("Extraction finished in %s", time_str);
        g_free (time_str);
 }
 
diff --git a/src/tracker-extract/tracker-main.c b/src/tracker-extract/tracker-main.c
index 7fce181d0..62ef4daf7 100644
--- a/src/tracker-extract/tracker-main.c
+++ b/src/tracker-extract/tracker-main.c
@@ -118,13 +118,13 @@ initialize_priority_and_scheduling (void)
         * successful call so we have to check value of errno too.
         * Stupid...
         */
-       g_message ("Setting priority nice level to 19");
+       TRACKER_NOTE (CONFIG, g_message ("Setting priority nice level to 19"));
 
        if (nice (19) == -1) {
                const gchar *str = g_strerror (errno);
 
-               g_message ("Couldn't set nice value to 19, %s",
-                          str ? str : "no error given");
+               TRACKER_NOTE (CONFIG, g_message ("Couldn't set nice value to 19, %s",
+                                     str ? str : "no error given"));
        }
 }
 
@@ -169,11 +169,15 @@ initialize_signal_handler (void)
 }
 
 static void
-sanity_check_option_values (TrackerConfig *config)
+log_option_values (TrackerConfig *config)
 {
-       g_message ("General options:");
-       g_message ("  Max bytes (per file)  .................  %d",
-                  tracker_config_get_max_bytes (config));
+#ifdef G_ENABLE_DEBUG
+       if (TRACKER_DEBUG_CHECK (CONFIG)) {
+               g_message ("General options:");
+               g_message ("  Max bytes (per file)  .................  %d",
+                          tracker_config_get_max_bytes (config));
+       }
+#endif
 }
 
 TrackerConfig *
@@ -349,7 +353,7 @@ main (int argc, char *argv[])
        config = tracker_config_new ();
 
        /* Extractor command line arguments */
-       sanity_check_option_values (config);
+       log_option_values (config);
 
        /* Set conditions when we use stand alone settings */
        if (filename) {