[tracker-miners/sam/debug-more: 1/5] Move various log messages into TRACKER_DEBUG=config and g_debug()
- From: Sam Thursfield <sthursfield src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker-miners/sam/debug-more: 1/5] Move various log messages into TRACKER_DEBUG=config and g_debug()
- Date: Mon, 27 Apr 2020 19:06:26 +0000 (UTC)
commit 53b53445e14326da43756b62b42c83ac591c4e32
Author: Sam Thursfield <sam afuera me uk>
Date: Sat Apr 25 16:37:03 2020 +0200
Move various log messages into TRACKER_DEBUG=config and g_debug()
src/libtracker-extract/tracker-module-manager.c | 10 +--
src/libtracker-miners-common/tracker-sched.c | 4 +-
src/miners/fs/tracker-main.c | 92 +++++++++++++------------
src/miners/fs/tracker-miner-files-index.c | 6 +-
src/miners/fs/tracker-miner-files.c | 86 +++++++++++------------
src/miners/fs/tracker-power-upower.c | 2 -
src/miners/fs/tracker-thumbnailer.c | 4 +-
src/tracker-extract/tracker-extract-decorator.c | 6 +-
src/tracker-extract/tracker-main.c | 20 +++---
9 files changed, 120 insertions(+), 110 deletions(-)
---
diff --git a/src/libtracker-extract/tracker-module-manager.c b/src/libtracker-extract/tracker-module-manager.c
index 1374f0c2d..c14374630 100644
--- a/src/libtracker-extract/tracker-module-manager.c
+++ b/src/libtracker-extract/tracker-module-manager.c
@@ -23,6 +23,8 @@
#include "tracker-module-manager.h"
+#include "libtracker-miners-common/tracker-debug.h"
+
#define EXTRACTOR_FUNCTION "tracker_extract_get_metadata"
#define INIT_FUNCTION "tracker_extract_module_init"
#define SHUTDOWN_FUNCTION "tracker_extract_module_shutdown"
@@ -181,7 +183,7 @@ tracker_extract_module_manager_init (void)
files = g_list_insert_sorted (files, (gpointer) name, (GCompareFunc) g_strcmp0);
}
- g_message ("Loading extractor rules... (%s)", extractors_dir);
+ TRACKER_NOTE (CONFIG, g_message ("Loading extractor rules... (%s)", extractors_dir));
rules = g_array_new (FALSE, TRUE, sizeof (RuleInfo));
@@ -193,7 +195,7 @@ tracker_extract_module_manager_init (void)
name = l->data;
if (!g_str_has_suffix (l->data, ".rule")) {
- g_message (" Skipping file '%s', no '.rule' suffix", name);
+ TRACKER_NOTE (CONFIG, g_message (" Skipping file '%s', no '.rule' suffix", name));
continue;
}
@@ -205,14 +207,14 @@ tracker_extract_module_manager_init (void)
g_warning (" Could not load extractor rule file '%s': %s", name, error->message);
g_clear_error (&error);
} else {
- g_debug (" Loaded rule '%s'", name);
+ TRACKER_NOTE (CONFIG, g_message (" Loaded rule '%s'", name));
}
g_key_file_free (key_file);
g_free (path);
}
- g_message ("Extractor rules loaded");
+ TRACKER_NOTE (CONFIG, g_message ("Extractor rules loaded"));
g_list_free (files);
g_dir_close (dir);
diff --git a/src/libtracker-miners-common/tracker-sched.c b/src/libtracker-miners-common/tracker-sched.c
index f4cd65f5b..9740ed457 100644
--- a/src/libtracker-miners-common/tracker-sched.c
+++ b/src/libtracker-miners-common/tracker-sched.c
@@ -26,6 +26,8 @@
#include "tracker-sched.h"
+#include "tracker-debug.h"
+
/* Sets the priority of the current thread to SCHED_IDLE.
*
* Threads spawned from a SCHED_IDLE thread will inherit the same priority,
@@ -45,7 +47,7 @@ tracker_sched_idle (void)
}
if (result == 0) {
- g_message ("Set scheduler policy to SCHED_IDLE");
+ TRACKER_NOTE (CONFIG, g_message ("Set scheduler policy to SCHED_IDLE"));
return TRUE;
} else {
diff --git a/src/miners/fs/tracker-main.c b/src/miners/fs/tracker-main.c
index e70d6d18f..cacd1aa25 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
@@ -162,8 +166,8 @@ save_current_locale (TrackerDomainOntology *domain_ontology)
locale_file = g_build_filename (cache_path, LOCALE_FILENAME, NULL);
g_free (cache_path);
- g_message ("Saving locale used to index applications");
- g_message (" Creating locale file '%s'", locale_file);
+ TRACKER_NOTE (CONFIG, g_message ("Saving locale used to index applications"));
+ TRACKER_NOTE (CONFIG, g_message (" Creating locale file '%s'", locale_file));
if (locale == NULL) {
locale = g_strdup ("");
@@ -212,7 +216,7 @@ detect_locale_changed (TrackerMiner *miner,
g_critical (" Could not get content of file '%s'", locale_file);
}
} else {
- g_message (" Could not find locale file:'%s'", locale_file);
+ TRACKER_NOTE (CONFIG, g_message (" Could not find locale file:'%s'", locale_file));
}
g_free (locale_file);
@@ -222,11 +226,11 @@ detect_locale_changed (TrackerMiner *miner,
/* Note that having both to NULL is actually valid, they would default
* to the unicode collation without locale-specific stuff. */
if (g_strcmp0 (previous_locale, current_locale) != 0) {
- g_message ("Locale change detected from '%s' to '%s'...",
- previous_locale, current_locale);
+ TRACKER_NOTE (CONFIG, g_message ("Locale change detected from '%s' to '%s'...",
+ previous_locale, current_locale));
changed = TRUE;
} else {
- g_message ("Current and previous locales match: '%s'", previous_locale);
+ TRACKER_NOTE (CONFIG, g_message ("Current and previous locales match: '%s'",
previous_locale));
changed = FALSE;
}
@@ -234,7 +238,7 @@ detect_locale_changed (TrackerMiner *miner,
g_free (previous_locale);
if (changed) {
- g_message ("Resetting nfo:Software due to locale change...");
+ TRACKER_NOTE (CONFIG, g_message ("Resetting nfo:Software due to locale change..."));
miner_reset_applications (miner);
}
@@ -298,7 +302,7 @@ initialize_priority_and_scheduling (void)
* Stupid...
*/
- g_message ("Setting priority nice level to 19");
+ TRACKER_NOTE (CONFIG, g_message ("Setting priority nice level to 19"));
errno = 0;
if (nice (19) == -1 && errno != 0) {
@@ -318,16 +322,16 @@ should_crawl (TrackerMinerFiles *miner_files,
crawling_interval = tracker_config_get_crawling_interval (config);
- g_message ("Checking whether to crawl file system based on configured crawling interval:");
+ TRACKER_NOTE (CONFIG, g_message ("Checking whether to crawl file system based on configured crawling
interval:"));
if (crawling_interval == -2) {
- g_message (" Disabled");
+ TRACKER_NOTE (CONFIG, g_message (" Disabled"));
return FALSE;
} else if (crawling_interval == -1) {
- g_message (" Maybe (depends on a clean last shutdown)");
+ TRACKER_NOTE (CONFIG, g_message (" Maybe (depends on a clean last shutdown)"));
return TRUE;
} else if (crawling_interval == 0) {
- g_message (" Forced");
+ TRACKER_NOTE (CONFIG, g_message (" Forced"));
if (forced) {
*forced = TRUE;
@@ -346,10 +350,10 @@ should_crawl (TrackerMinerFiles *miner_files,
now = (guint64) time (NULL);
if (now < then + (crawling_interval * SECONDS_PER_DAY)) {
- g_message (" Postponed");
+ TRACKER_NOTE (CONFIG, g_message (" Postponed"));
return FALSE;
} else {
- g_message (" (More than) %d days after last crawling, enabled", crawling_interval);
+ TRACKER_NOTE (CONFIG, g_message (" (More than) %d days after last crawling,
enabled", crawling_interval));
return TRUE;
}
}
@@ -359,7 +363,7 @@ static void
miner_do_start (TrackerMiner *miner)
{
if (!tracker_miner_is_started (miner)) {
- g_message ("Starting filesystem miner...");
+ g_debug ("Starting filesystem miner...");
tracker_miner_start (miner);
}
}
@@ -853,7 +857,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);
@@ -871,10 +875,10 @@ main (gint argc, gchar *argv[])
g_free (domain_name);
}
- g_message ("Checking if we're running as a daemon:");
- g_message (" %s %s",
- no_daemon ? "No" : "Yes",
- no_daemon ? "(forced by command line)" : "");
+ TRACKER_NOTE (CONFIG, g_message ("Checking if we're running as a daemon:"));
+ TRACKER_NOTE (CONFIG, g_message (" %s %s",
+ no_daemon ? "No" : "Yes",
+ no_daemon ? "(forced by command line)" : ""));
if (!setup_connection_and_endpoint (domain_ontology,
connection,
@@ -957,7 +961,7 @@ main (gint argc, gchar *argv[])
* Set to TRUE here in case we crash and miss file system
* events.
*/
- g_message ("Checking whether to force mtime checking during crawling (based on last clean
shutdown):");
+ TRACKER_NOTE (CONFIG, g_message ("Checking whether to force mtime checking during crawling (based on
last clean shutdown):"));
/* Override the shutdown state decision based on the config */
if (force_mtime_checking) {
@@ -966,9 +970,9 @@ main (gint argc, gchar *argv[])
do_mtime_checking = tracker_miner_files_get_need_mtime_check (TRACKER_MINER_FILES
(miner_files));
}
- g_message (" %s %s",
- do_mtime_checking ? "Yes" : "No",
- force_mtime_checking ? "(forced from config)" : "");
+ TRACKER_NOTE (CONFIG, g_message (" %s %s",
+ do_mtime_checking ? "Yes" : "No",
+ force_mtime_checking ? "(forced from config)" : ""));
/* Set the need for an mtime check to TRUE so we check in the
* event of a crash, this is changed back on shutdown if
@@ -990,7 +994,7 @@ main (gint argc, gchar *argv[])
/* Go, go, go! */
g_main_loop_run (main_loop);
- g_message ("Shutdown started");
+ g_debug ("Shutdown started");
if (miners_timeout_id == 0 && !miner_needs_check (miner_files)) {
tracker_miner_files_set_need_mtime_check (TRACKER_MINER_FILES (miner_files), FALSE);
diff --git a/src/miners/fs/tracker-miner-files-index.c b/src/miners/fs/tracker-miner-files-index.c
index e2c3093af..480360fc6 100644
--- a/src/miners/fs/tracker-miner-files-index.c
+++ b/src/miners/fs/tracker-miner-files-index.c
@@ -537,9 +537,9 @@ tracker_miner_files_index_new (TrackerMinerFiles *miner_files)
/* Register the service name for the miner */
full_path = g_strconcat (TRACKER_MINER_DBUS_PATH_PREFIX, "Files/Index", NULL);
- g_message ("Registering D-Bus object...");
- g_message (" Path:'%s'", full_path);
- g_message (" Object Type:'%s'", G_OBJECT_TYPE_NAME (miner));
+ g_debug ("Registering D-Bus object...");
+ g_debug (" Path:'%s'", full_path);
+ g_debug (" Object Type:'%s'", G_OBJECT_TYPE_NAME (miner));
priv->registration_id =
g_dbus_connection_register_object (priv->d_connection,
diff --git a/src/miners/fs/tracker-miner-files.c b/src/miners/fs/tracker-miner-files.c
index eb8538da6..b2787cdce 100644
--- a/src/miners/fs/tracker-miner-files.c
+++ b/src/miners/fs/tracker-miner-files.c
@@ -643,7 +643,7 @@ miner_files_initable_init (GInitable *initable,
check_battery_status (mf);
#endif /* defined(HAVE_UPOWER) || defined(HAVE_HAL) */
- g_message ("Setting up directories to iterate from config (IndexSingleDirectory)");
+ TRACKER_NOTE (CONFIG, g_message ("Setting up directories to iterate from config
(IndexSingleDirectory)"));
/* Fill in directories to inspect */
dirs = tracker_config_get_index_single_directories (mf->private->config);
@@ -675,13 +675,13 @@ miner_files_initable_init (GInitable *initable,
}
if (found) {
- g_message (" Duplicate found:'%s' - same as removable device path",
+ g_debug (" Duplicate found:'%s' - same as removable device path",
(gchar*) dirs->data);
continue;
}
}
- g_message (" Adding:'%s'", (gchar*) dirs->data);
+ g_debug (" Adding:'%s'", (gchar*) dirs->data);
file = g_file_new_for_path (dirs->data);
@@ -699,7 +699,7 @@ miner_files_initable_init (GInitable *initable,
g_object_unref (file);
}
- g_message ("Setting up directories to iterate from config (IndexRecursiveDirectory)");
+ TRACKER_NOTE (CONFIG, g_message ("Setting up directories to iterate from config
(IndexRecursiveDirectory)"));
dirs = tracker_config_get_index_recursive_directories (mf->private->config);
@@ -730,13 +730,13 @@ miner_files_initable_init (GInitable *initable,
}
if (found) {
- g_message (" Duplicate found:'%s' - same as removable device path",
+ g_debug (" Duplicate found:'%s' - same as removable device path",
(gchar*) dirs->data);
continue;
}
}
- g_message (" Adding:'%s'", (gchar*) dirs->data);
+ g_debug (" Adding:'%s'", (gchar*) dirs->data);
file = g_file_new_for_path (dirs->data);
@@ -755,17 +755,17 @@ miner_files_initable_init (GInitable *initable,
}
/* Add mounts */
- g_message ("Setting up directories to iterate from devices/discs");
+ TRACKER_NOTE (CONFIG, g_message ("Setting up directories to iterate from devices/discs"));
if (!mf->private->index_removable_devices) {
- g_message (" Removable devices are disabled in the config");
+ TRACKER_NOTE (CONFIG, g_message (" Removable devices are disabled in the config"));
/* Make sure we don't have any resource in a volume of the given type */
miner_files_in_removable_media_remove_by_type (mf, TRACKER_STORAGE_REMOVABLE);
}
if (!mf->private->index_optical_discs) {
- g_message (" Optical discs are disabled in the config");
+ TRACKER_NOTE (CONFIG, g_message (" Optical discs are disabled in the config"));
/* Make sure we don't have any resource in a volume of the given type */
miner_files_in_removable_media_remove_by_type (mf, TRACKER_STORAGE_REMOVABLE |
TRACKER_STORAGE_OPTICAL);
@@ -985,13 +985,13 @@ ensure_mount_point_exists (TrackerMinerFiles *miner,
if (iri) {
/* If exists, just return, nothing else to do */
- g_message ("Mount point '%s' already exists in store: '%s'",
- uri, iri);
+ g_debug ("Mount point '%s' already exists in store: '%s'",
+ uri, iri);
g_free (iri);
} else {
/* If it doesn't exist, we need to create it */
- g_message ("Mount point '%s' does not exist in store, need to create it",
- uri);
+ g_debug ("Mount point '%s' does not exist in store, need to create it",
+ uri);
/* Create a nfo:Folder for the mount point */
g_string_append_printf (accumulator,
@@ -1428,7 +1428,7 @@ cleanup_stale_removable_volumes_cb (gpointer user_data)
n_days_ago = (time (NULL) - (SECONDS_PER_DAY * n_days_threshold));
n_days_ago_as_string = tracker_date_to_string (n_days_ago);
- g_message ("Running stale volumes check...");
+ g_debug ("Running stale volumes check...");
miner_files_in_removable_media_remove_by_date (miner, n_days_ago_as_string);
@@ -1442,14 +1442,14 @@ init_stale_volume_removal (TrackerMinerFiles *miner)
{
/* If disabled, make sure we don't do anything */
if (tracker_config_get_removable_days_threshold (miner->private->config) == 0) {
- g_message ("Stale volume check is disabled");
+ g_debug ("Stale volume check is disabled");
return;
}
/* Run right away the first check */
cleanup_stale_removable_volumes_cb (miner);
- g_message ("Initializing stale volume check timeout...");
+ g_debug ("Initializing stale volume check timeout...");
/* Then, setup new timeout event every day */
miner->private->stale_volumes_check_id =
@@ -1504,12 +1504,12 @@ mount_point_added_cb (TrackerStorage *storage,
priv = TRACKER_MINER_FILES_GET_PRIVATE (miner);
urn = g_strdup_printf (TRACKER_PREFIX_DATASOURCE_URN "%s", uuid);
- g_message ("Mount point added for URN '%s'", urn);
+ g_debug ("Mount point added for URN '%s'", urn);
if (removable && !priv->index_removable_devices) {
- g_message (" Not crawling, removable devices disabled in config");
+ g_debug (" Not crawling, removable devices disabled in config");
} else if (optical && !priv->index_optical_discs) {
- g_message (" Not crawling, optical devices discs disabled in config");
+ g_debug (" Not crawling, optical devices discs disabled in config");
} else if (!removable && !optical) {
TrackerIndexingTree *indexing_tree;
TrackerDirectoryFlags flags;
@@ -1540,17 +1540,17 @@ mount_point_added_cb (TrackerStorage *storage,
g_file_has_prefix (config_file, mount_point_file)) {
/* If the config path is contained inside the mount path,
* then add the config path to re-check */
- g_message (" Re-check of configured path '%s' needed (recursively)",
- (gchar *) l->data);
+ g_debug (" Re-check of configured path '%s' needed (recursively)",
+ (gchar *) l->data);
tracker_indexing_tree_add (indexing_tree,
config_file,
flags);
} else if (g_file_has_prefix (mount_point_file, config_file)) {
/* If the mount path is contained inside the config path,
* then add the mount path to re-check */
- g_message (" Re-check of path '%s' needed (inside configured path '%s')",
- mount_point,
- (gchar *) l->data);
+ g_debug (" Re-check of path '%s' needed (inside configured path '%s')",
+ mount_point,
+ (gchar *) l->data);
tracker_indexing_tree_add (indexing_tree,
config_file,
flags);
@@ -1574,8 +1574,8 @@ mount_point_added_cb (TrackerStorage *storage,
config_file = g_file_new_for_path (l->data);
if (g_file_equal (config_file, mount_point_file) ||
g_file_has_prefix (config_file, mount_point_file)) {
- g_message (" Re-check of configured path '%s' needed (non-recursively)",
- (gchar *) l->data);
+ g_debug (" Re-check of configured path '%s' needed (non-recursively)",
+ (gchar *) l->data);
tracker_indexing_tree_add (indexing_tree,
config_file,
flags);
@@ -1585,7 +1585,7 @@ mount_point_added_cb (TrackerStorage *storage,
g_object_unref (mount_point_file);
} else {
- g_message (" Adding directories in removable/optical media to crawler's queue");
+ g_debug (" Adding directories in removable/optical media to crawler's queue");
miner_files_add_removable_or_optical_directory (miner,
mount_point,
uuid);
@@ -1750,7 +1750,7 @@ mount_pre_unmount_cb (GVolumeMonitor *volume_monitor,
mount_root = g_mount_get_root (mount);
uri = g_file_get_uri (mount_root);
- g_message ("Pre-unmount requested for '%s'", uri);
+ g_debug ("Pre-unmount requested for '%s'", uri);
indexing_tree = tracker_miner_fs_get_indexing_tree (TRACKER_MINER_FS (mf));
tracker_indexing_tree_remove (indexing_tree, mount_root);
@@ -1834,8 +1834,8 @@ disk_space_check_start (TrackerMinerFiles *mf)
limit = tracker_config_get_low_disk_space_limit (mf->private->config);
if (limit != -1) {
- g_message ("Starting disk space check for every %d seconds",
- DISK_SPACE_CHECK_FREQUENCY);
+ TRACKER_NOTE (CONFIG, g_message ("Starting disk space check for every %d seconds",
+ DISK_SPACE_CHECK_FREQUENCY));
mf->private->disk_space_check_id =
g_timeout_add_seconds (DISK_SPACE_CHECK_FREQUENCY,
disk_space_check_cb,
@@ -1846,7 +1846,7 @@ disk_space_check_start (TrackerMinerFiles *mf)
*/
disk_space_check_cb (mf);
} else {
- g_message ("Not setting disk space, configuration is set to -1 (disabled)");
+ TRACKER_NOTE (CONFIG, g_message ("Not setting disk space, configuration is set to -1
(disabled)"));
}
}
@@ -1854,7 +1854,7 @@ static void
disk_space_check_stop (TrackerMinerFiles *mf)
{
if (mf->private->disk_space_check_id) {
- g_message ("Stopping disk space check");
+ TRACKER_NOTE (CONFIG, g_message ("Stopping disk space check"));
g_source_remove (mf->private->disk_space_check_id);
mf->private->disk_space_check_id = 0;
}
@@ -1923,8 +1923,8 @@ update_directories_from_new_config (TrackerMinerFS *mf,
priv = TRACKER_MINER_FILES_GET_PRIVATE (mf);
indexing_tree = tracker_miner_fs_get_indexing_tree (mf);
- g_message ("Updating %s directories changed from configuration",
- recurse ? "recursive" : "single");
+ TRACKER_NOTE (CONFIG, g_message ("Updating %s directories changed from configuration",
+ recurse ? "recursive" : "single"));
/* First remove all directories removed from the config */
for (sl = old_dirs; sl; sl = sl->next) {
@@ -1936,7 +1936,7 @@ update_directories_from_new_config (TrackerMinerFS *mf,
if (!tracker_string_in_gslist (path, new_dirs)) {
GFile *file;
- g_message (" Removing directory: '%s'", path);
+ TRACKER_NOTE (CONFIG, g_message (" Removing directory: '%s'", path));
file = g_file_new_for_path (path);
@@ -1986,7 +1986,7 @@ update_directories_from_new_config (TrackerMinerFS *mf,
if (!tracker_string_in_gslist (path, old_dirs)) {
GFile *file;
- g_message (" Adding directory:'%s'", path);
+ TRACKER_NOTE (CONFIG, g_message (" Adding directory:'%s'", path));
file = g_file_new_for_path (path);
tracker_indexing_tree_add (indexing_tree, file, flags);
@@ -2080,7 +2080,7 @@ trigger_recheck_cb (GObject *gobject,
{
TrackerMinerFiles *mf = user_data;
- g_message ("Ignored content related configuration changed, checking index...");
+ TRACKER_NOTE (CONFIG, g_message ("Ignored content related configuration changed, checking index..."));
if (mf->private->force_recheck_id == 0) {
/* Set idle so multiple changes in the config lead to one recheck */
@@ -2098,7 +2098,7 @@ index_volumes_changed_idle (gpointer user_data)
gboolean new_index_removable_devices;
gboolean new_index_optical_discs;
- g_message ("Volume related configuration changed, updating...");
+ TRACKER_NOTE (CONFIG, g_message ("Volume related configuration changed, updating..."));
/* Read new config values. Note that if removable devices is FALSE,
* optical discs will also always be FALSE. */
@@ -2249,7 +2249,7 @@ miner_files_add_application_dir (TrackerMinerFiles *mf,
/* Add $dir/applications */
path = g_build_filename (dir, "applications", NULL);
file = g_file_new_for_path (path);
- g_message (" Adding:'%s'", path);
+ TRACKER_NOTE (CONFIG, g_message (" Adding:'%s'", path));
tracker_indexing_tree_add (indexing_tree, file,
TRACKER_DIRECTORY_FLAG_RECURSE |
@@ -2272,7 +2272,7 @@ set_up_application_indexing (TrackerMinerFiles *mf)
indexing_tree = tracker_miner_fs_get_indexing_tree (TRACKER_MINER_FS (mf));
if (tracker_config_get_index_applications (mf->private->config)) {
- g_message ("Setting up applications to iterate from XDG system directories");
+ TRACKER_NOTE (CONFIG, g_message ("Setting up applications to iterate from XDG system
directories"));
xdg_dirs = g_get_system_data_dirs ();
for (i = 0; xdg_dirs[i]; i++) {
@@ -2284,7 +2284,7 @@ set_up_application_indexing (TrackerMinerFiles *mf)
miner_files_add_application_dir (mf, indexing_tree, user_data_dir);
}
} else {
- g_message ("Removing configured application directories from indexing tree");
+ TRACKER_NOTE (CONFIG, g_message ("Removing configured application directories from indexing
tree"));
for (n = mf->private->application_dirs; n != NULL; n = n->next) {
tracker_indexing_tree_remove (indexing_tree, G_FILE (n->data));
@@ -2314,7 +2314,7 @@ index_applications_changed_cb (GObject *gobject,
{
TrackerMinerFiles *miner_files = user_data;
- g_message ("Application related configuration changed, updating...");
+ TRACKER_NOTE (CONFIG, g_message ("Application related configuration changed, updating..."));
if (miner_files->private->applications_changed_id == 0) {
/* Set idle so multiple changes in the config lead to one check */
@@ -3311,7 +3311,7 @@ miner_files_add_removable_or_optical_directory (TrackerMinerFiles *mf,
g_strdup (uuid),
(GDestroyNotify) g_free);
- g_message (" Adding removable/optical: '%s'", mount_path);
+ g_debug (" Adding removable/optical: '%s'", mount_path);
tracker_indexing_tree_add (indexing_tree,
mount_point_file,
flags);
diff --git a/src/miners/fs/tracker-power-upower.c b/src/miners/fs/tracker-power-upower.c
index 2d9cedc8a..fbc130b48 100644
--- a/src/miners/fs/tracker-power-upower.c
+++ b/src/miners/fs/tracker-power-upower.c
@@ -131,8 +131,6 @@ tracker_power_initable_init (GInitable *initable,
TrackerPower *power;
TrackerPowerPrivate *priv;
- g_message ("Initializing UPower...");
-
power = TRACKER_POWER (initable);
priv = GET_PRIV (power);
diff --git a/src/miners/fs/tracker-thumbnailer.c b/src/miners/fs/tracker-thumbnailer.c
index b4d70cdbc..f2bf09235 100644
--- a/src/miners/fs/tracker-thumbnailer.c
+++ b/src/miners/fs/tracker-thumbnailer.c
@@ -142,7 +142,7 @@ tracker_thumbnailer_initable_init (GInitable *initable,
private->request_id = 1;
private->service_is_available = FALSE;
- g_message ("Thumbnailer connections being set up... (using same bus as Tracker, i.e. session or
system)");
+ g_debug ("Thumbnailer connections being set up... (using same bus as Tracker, i.e. session or
system)");
private->connection = g_bus_get_sync (TRACKER_IPC_BUS, NULL, error);
@@ -212,7 +212,7 @@ tracker_thumbnailer_initable_init (GInitable *initable,
}
i = g_hash_table_size (hash);
- g_message ("Thumbnailer supports %d mime types", i);
+ g_debug ("Thumbnailer supports %d mime types", i);
g_hash_table_iter_init (&iter, hash);
private->supported_mime_types = (GStrv) g_new0 (gchar *, i + 1);
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) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
