[tracker] tracker-extract: Removed some logging on start up

[Martyn James Russell <mr src gnome org>]

commit e34e3f6dd9e3ea9a37bb025cfb92f2b076914c2a
Author: Martyn Russell <martyn lanedo com>
Date:   Tue Oct 27 13:05:28 2009 +0000

    tracker-extract: Removed some logging on start up
    
    Based on a patch from 0.6 for NB#126773, trackerd and tracker-extract
    spam syslog. See commit 65adc16dc0183a1a9b08eb85440312399748262a.

 src/libtracker-common/tracker-ioprio.c |    2 -
 src/tracker-extract/tracker-dbus.c     |    7 +-
 src/tracker-extract/tracker-dbus.h     |    3 +-
 src/tracker-extract/tracker-main.c     |  174 ++++++++++++++++++-------------
 4 files changed, 104 insertions(+), 82 deletions(-)
---
diff --git a/src/libtracker-common/tracker-ioprio.c b/src/libtracker-common/tracker-ioprio.c
index 4027f99..8ef7f6e 100644
--- a/src/libtracker-common/tracker-ioprio.c
+++ b/src/libtracker-common/tracker-ioprio.c
@@ -128,8 +128,6 @@ set_io_priority_best_effort (int ioprio_val)
 void
 tracker_ioprio_init (void)
 {
-	g_message ("Setting IO priority");
-
 	if (set_io_priority_idle () == -1) {
 		g_message ("Could not set idle IO priority, attempting best effort of 7");
 
diff --git a/src/tracker-extract/tracker-dbus.c b/src/tracker-extract/tracker-dbus.c
index 72f6ccf..a2dcd8b 100644
--- a/src/tracker-extract/tracker-dbus.c
+++ b/src/tracker-extract/tracker-dbus.c
@@ -153,10 +153,9 @@ tracker_dbus_shutdown (void)
 }
 
 gboolean
-tracker_dbus_register_objects (gboolean disable_shutdown,
-			       gboolean internal_extractors)
+tracker_dbus_register_objects (gpointer object)
 {
-	gpointer object;
+	g_return_val_if_fail (TRACKER_IS_EXTRACT (object), FALSE);
 
 	if (!connection || !gproxy) {
 		g_critical ("D-Bus support must be initialized before registering objects!");
@@ -164,8 +163,6 @@ tracker_dbus_register_objects (gboolean disable_shutdown,
 	}
 
 	/* Add org.freedesktop.Tracker1.Extract */
-	object = tracker_extract_new (disable_shutdown,
-				      internal_extractors);
 	if (!object) {
 		g_critical ("Could not create TrackerExtract object to register");
 		return FALSE;
diff --git a/src/tracker-extract/tracker-dbus.h b/src/tracker-extract/tracker-dbus.h
index 4948938..c3fdc13 100644
--- a/src/tracker-extract/tracker-dbus.h
+++ b/src/tracker-extract/tracker-dbus.h
@@ -30,8 +30,7 @@ G_BEGIN_DECLS
 
 gboolean tracker_dbus_init             (void);
 void     tracker_dbus_shutdown         (void);
-gboolean tracker_dbus_register_objects (gboolean disable_shutdown,
-					gboolean force_internal_extractors);
+gboolean tracker_dbus_register_objects (gpointer object);
 GObject *tracker_dbus_get_object       (GType    type);
 
 G_END_DECLS
diff --git a/src/tracker-extract/tracker-main.c b/src/tracker-extract/tracker-main.c
index 0332ccc..3001bf7 100644
--- a/src/tracker-extract/tracker-main.c
+++ b/src/tracker-extract/tracker-main.c
@@ -171,7 +171,7 @@ initialize_directories (void)
 					  "tracker",
 					  NULL);
 	
-	g_message ("Checking directory exists:'%s'", user_data_dir);
+	/* g_message ("Checking directory exists:'%s'", user_data_dir); */
 	g_mkdir_with_parents (user_data_dir, 00755);
 
 	g_free (user_data_dir);
@@ -234,9 +234,7 @@ log_handler (const gchar    *domain,
 	     const gchar    *message,
 	     gpointer	     user_data)
 {
-	if (((log_level & G_LOG_LEVEL_DEBUG) && verbosity < 3) ||
-	    ((log_level & G_LOG_LEVEL_INFO) && verbosity < 2) ||
-	    ((log_level & G_LOG_LEVEL_MESSAGE) && verbosity < 1)) {
+	if (!tracker_log_should_handle (log_level, verbosity)) {
 		return;
 	}
 
@@ -270,27 +268,66 @@ tracker_main_get_fts_config (void)
 	return fts_config;
 }
 
-int
-main (int argc, char *argv[])
+
+static int
+run_standalone (void)
 {
-	GOptionContext *context;
-	GError         *error = NULL;
-	TrackerConfig  *config;
-	gchar          *log_filename = NULL;
-	gboolean        stand_alone = FALSE;
-	guint           log_handler_id = 0;
+	TrackerExtract *object;
+	GFile *file;
+	gchar *uri;
+	guint log_handler_id;
+
+	/* Set log handler for library messages */
+	log_handler_id = g_log_set_handler (NULL,
+					    G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL,
+					    log_handler,
+					    NULL);
+
+	g_log_set_default_handler (log_handler, NULL);
+
+	/* Set the default verbosity if unset */
+	if (verbosity == -1) {
+		verbosity = 3;
+	}
 
-	g_type_init ();
+	/* This makes sure we don't steal all the system's resources */
+	initialize_priority ();
 
-	if (!g_thread_supported ()) {
-		g_thread_init (NULL);
+	file = g_file_new_for_commandline_arg (filename);
+	uri = g_file_get_uri (file);
+
+	object = tracker_extract_new (disable_shutdown,
+				      force_internal_extractors);
+
+	if (!object) {
+		g_free (uri);
+		return EXIT_FAILURE;
 	}
 
-	dbus_g_thread_init ();
+	tracker_memory_setrlimits ();
 
-	g_set_application_name ("tracker-extract");
+	tracker_extract_get_metadata_by_cmdline (object, uri, mime_type);
 
-	setlocale (LC_ALL, "");
+	g_object_unref (object);
+	g_object_unref (file);
+	g_free (uri);
+
+	if (log_handler_id != 0) {
+		/* Unset log handler */
+		g_log_remove_handler (NULL, log_handler_id);
+	}
+
+	return EXIT_SUCCESS;
+}
+ 
+int
+main (int argc, char *argv[])
+{
+	GOptionContext *context;
+	GError         *error = NULL;
+	TrackerConfig  *config;
+        TrackerExtract *object;
+	gchar          *log_filename;
 
 	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
@@ -303,9 +340,6 @@ main (int argc, char *argv[])
 	g_option_context_add_main_entries (context, entries, NULL);
 	g_option_context_parse (context, &argc, &argv, &error);
 
-	/* This makes sure we don't steal all the system's resources */
-	initialize_priority ();
-
 	if (!filename && mime_type) {
 		gchar *help;
 
@@ -328,53 +362,33 @@ main (int argc, char *argv[])
 	}
 
 	g_print ("Initializing tracker-extract...\n");
-	g_print ("  Shutdown after 30 seconds of inactivitiy is %s\n",
-		 disable_shutdown ? "disabled" : "enabled");
+
+	if (!filename) {
+		g_print ("  Shutdown after 30 seconds of inactivitiy is %s\n",
+			 disable_shutdown ? "disabled" : "enabled");
+	}
 
 	initialize_signal_handler ();
 
-	tracker_memory_setrlimits ();
+	g_type_init ();
 
-	/* Set conditions when we use stand alone settings */
-	stand_alone |= filename != NULL;
-
-	if (stand_alone) {
-		/* Set log handler for library messages */
-		log_handler_id = g_log_set_handler (NULL,
-						    G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL,
-						    log_handler,
-						    NULL);
-		
-		g_log_set_default_handler (log_handler, NULL);
-
-		/* Set the default verbosity if unset */
-		if (verbosity == -1) {
-			verbosity = 3;
-		}
+	if (!g_thread_supported ()) {
+		g_thread_init (NULL);
 	}
 
-	if (filename) {
-		TrackerExtract *extract;
-		GFile *file;
-		gchar *uri;
-
-		extract = tracker_extract_new (disable_shutdown, 
-					       force_internal_extractors);
-		if (!extract) {
-			return EXIT_FAILURE;
-		}
+	dbus_g_thread_init ();
 
-		file = g_file_new_for_commandline_arg (filename);
-		uri = g_file_get_uri (file);
+	g_set_application_name ("tracker-extract");
 
-		tracker_extract_get_metadata_by_cmdline (extract, uri, mime_type);
+	setlocale (LC_ALL, "");
 
-		g_object_unref (extract);
-		g_object_unref (file);
-		g_free (uri);
+	/* Set conditions when we use stand alone settings */
+	if (filename) {
+		return run_standalone ();
+	} 
 
-		goto done;
-	}
+	/* Initialize subsystems */
+	initialize_directories ();
 
 	config = tracker_config_new ();
 
@@ -383,22 +397,43 @@ main (int argc, char *argv[])
 		tracker_config_set_verbosity (config, verbosity);
 	}
 
+	log_filename =
+		g_build_filename (g_get_user_data_dir (),
+				  "tracker",
+				  "tracker-extract.log",
+				  NULL);
+
+	tracker_log_init (tracker_config_get_verbosity (config), NULL);
+	g_print ("Starting log:\n  File:'%s'\n", log_filename);
+	g_free (log_filename);
+
+	/* This makes sure we don't steal all the system's resources */
+	initialize_priority ();
+
 	if (!tracker_dbus_init ()) {
+		g_object_unref (config);
+		tracker_log_shutdown ();
+
 		return EXIT_FAILURE;
 	}
 
-	/* Initialize subsystems */
-	initialize_directories ();
+	object = tracker_extract_new (disable_shutdown,
+				      force_internal_extractors);
 
-	tracker_log_init (tracker_config_get_verbosity (config),
-			  &log_filename);
-	g_print ("Starting log:\n  File:'%s'\n", log_filename);
-	g_free (log_filename);
+	if (!object) {
+		g_object_unref (config);
+		tracker_log_shutdown ();
+
+		return EXIT_FAILURE;
+	}
+
+	tracker_memory_setrlimits ();
 
 	/* Make Tracker available for introspection */
-	if (!tracker_dbus_register_objects (disable_shutdown,
-					    force_internal_extractors)) {
+	if (!tracker_dbus_register_objects (object)) {
+		g_object_unref (object);
 		g_object_unref (config);
+		tracker_log_shutdown ();
 
 		return EXIT_FAILURE;
 	}
@@ -420,12 +455,5 @@ main (int argc, char *argv[])
 
 	g_object_unref (config);
 
-done:
-
-	if (log_handler_id != 0) {
-		/* Unset log handler */
-		g_log_remove_handler (NULL, log_handler_id);
-	}
-
 	return EXIT_SUCCESS;
 }