[tracker-miners/sam/debug: 1/2] Remove TRACKER_VERBOSITY and tracker-log module
- From: Sam Thursfield <sthursfield src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker-miners/sam/debug: 1/2] Remove TRACKER_VERBOSITY and tracker-log module
- Date: Mon, 20 Apr 2020 00:52:19 +0000 (UTC)
commit 3d5694198a99c19852424824e9d1640bd5e2cf35
Author: Sam Thursfield <sam afuera me uk>
Date: Mon Apr 20 02:27:52 2020 +0200
Remove TRACKER_VERBOSITY and tracker-log module
Users should now use G_MESSAGES_DEBUG=Tracker to see debug messages
on the console.
The TRACKER_VERBOSITY only worked if tracker_log_init() had been called,
which can't be done when libtracker-sparql is being used from an
application outside of Tracker.
This also removes some little-used config utilities in the cli.
For `tracker reset --config`, you can instead use `gsettings
--reset-recursively`.
data/meson.build | 1 -
data/org.freedesktop.Tracker.Extract.gschema.xml | 6 -
...org.freedesktop.Tracker.Miner.Files.gschema.xml | 6 -
data/org.freedesktop.Tracker.Writeback.gschema.xml | 28 ---
docs/manpages/tracker-daemon.1.txt | 24 +--
docs/manpages/tracker-extract.1.txt | 15 --
docs/manpages/tracker-miner-fs.1.txt | 2 -
docs/manpages/tracker-miner-rss.1.txt | 2 -
docs/manpages/tracker-reset.1.txt | 4 +-
docs/manpages/tracker-writeback.1.txt | 2 -
.../libtracker-miners-common.vapi | 6 -
src/libtracker-miners-common/tracker-common.h | 1 -
src/libtracker-miners-common/tracker-dbus.c | 1 -
src/libtracker-miners-common/tracker-file-utils.c | 1 -
src/libtracker-miners-common/tracker-language.c | 1 -
src/libtracker-miners-common/tracker-type-utils.c | 1 -
src/miners/fs/tracker-config.c | 47 +----
src/miners/fs/tracker-config.h | 3 -
src/miners/fs/tracker-main.c | 17 --
src/miners/fs/tracker-storage.c | 2 -
src/miners/rss/tracker-main.c | 14 --
src/tracker-extract/tracker-config.c | 57 +-----
src/tracker-extract/tracker-config.h | 4 -
src/tracker-extract/tracker-main.c | 24 ---
src/tracker-writeback/meson.build | 2 -
src/tracker-writeback/tracker-config.c | 196 -------------------
src/tracker-writeback/tracker-config.h | 56 ------
src/tracker-writeback/tracker-main.c | 34 ----
src/tracker/meson.build | 1 -
src/tracker/tracker-config.c | 212 ---------------------
src/tracker/tracker-config.h | 39 ----
src/tracker/tracker-daemon.c | 184 ------------------
src/tracker/tracker-extract.c | 33 +---
src/tracker/tracker-reset.c | 47 -----
src/tracker/tracker-search.c | 2 -
src/tracker/tracker-status.c | 42 +---
tests/functional-tests/fixtures.py | 2 +-
.../tracker-module-manager-test.c | 3 -
38 files changed, 14 insertions(+), 1108 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index f96acde04..7f6672f49 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -2,7 +2,6 @@ schemas = {
'org.freedesktop.Tracker.Extract.gschema.xml': 'org.freedesktop.Tracker@0 Extract gschema
xml'.format(tracker_api_major),
'org.freedesktop.Tracker.FTS.gschema.xml': 'org.freedesktop.Tracker@0 FTS gschema
xml'.format(tracker_api_major),
'org.freedesktop.Tracker.Miner.Files.gschema.xml': 'org.freedesktop.Tracker@0 Miner Files gschema
xml'.format(tracker_api_major),
- 'org.freedesktop.Tracker.Writeback.gschema.xml': 'org.freedesktop.Tracker@0 Writeback gschema
xml'.format(tracker_api_major),
}
schemas_file_deps = []
diff --git a/data/org.freedesktop.Tracker.Extract.gschema.xml
b/data/org.freedesktop.Tracker.Extract.gschema.xml
index 1b3fba290..3249e2135 100644
--- a/data/org.freedesktop.Tracker.Extract.gschema.xml
+++ b/data/org.freedesktop.Tracker.Extract.gschema.xml
@@ -19,12 +19,6 @@ Boston, MA 02110-1301, USA.
-->
<schemalist>
<schema id="org.freedesktop.Tracker3.Extract" path="/org/freedesktop/tracker/extract/"
gettext-domain="tracker-miners">
- <key name="verbosity" enum="org.freedesktop.TrackerMiners3.TrackerVerbosity">
- <default>'errors'</default>
- <summary>Log verbosity</summary>
- <description>Log verbosity.</description>
- </key>
-
<key name="max-bytes" type="i">
<summary>Max bytes to extract</summary>
<description>Maximum number of UTF-8 bytes to extract.</description>
diff --git a/data/org.freedesktop.Tracker.Miner.Files.gschema.xml
b/data/org.freedesktop.Tracker.Miner.Files.gschema.xml
index d3ab5c4d0..4c572237e 100644
--- a/data/org.freedesktop.Tracker.Miner.Files.gschema.xml
+++ b/data/org.freedesktop.Tracker.Miner.Files.gschema.xml
@@ -19,12 +19,6 @@ Boston, MA 02110-1301, USA.
-->
<schemalist>
<schema id="org.freedesktop.Tracker3.Miner.Files" path="/org/freedesktop/tracker/miner/files/"
gettext-domain="tracker-miners">
- <key name="verbosity" enum="org.freedesktop.TrackerMiners3.TrackerVerbosity">
- <default>'errors'</default>
- <summary>Log verbosity</summary>
- <description>Log verbosity.</description>
- </key>
-
<key name="initial-sleep" type="i">
<summary>Initial sleep</summary>
<description>Initial sleep time, in seconds.</description>
diff --git a/docs/manpages/tracker-daemon.1.txt b/docs/manpages/tracker-daemon.1.txt
index d21281163..af6d9c4cd 100644
--- a/docs/manpages/tracker-daemon.1.txt
+++ b/docs/manpages/tracker-daemon.1.txt
@@ -23,8 +23,7 @@ The *tracker daemon* command allows for control of these components.
This ranges from starting, stopping and killing processes to pausing and
resuming them.
-In addition to all this, there are ways to change the log verbsity for
-all processes that generate logs and to follow or watch what is
+In addition to all this, there are ways to follow or watch what is
happening in real time from a top level and right down where the SPARQL
commits are happening too.
@@ -48,27 +47,6 @@ also list miners running and available.
--kill because it gives the processes time to shutdown cleanly.
*-s, --start*::
Starts all miners.
-*--get-log-verbosity*::
- This displays the log verbosity for ALL components using GSettings for
- this configuration. For possible values, see *--set-log-verbosity.*
-*--set-log-verbosity=<__verbosity__>*::
- This sets the log verbosity for ALL daemons using GSettings to store
- their "verbosity" configuration.
-
-The possible _verbosity_ options are:
-
-__________________________________________________________________________________________________________
-· _debug_ - Show EVERYTHING, from debug messages to errors. This often
-includes actual SQL being executed.
-
-· _detailed_ - Show enough detail to understand what is happening.
-
-· _minimal_ - Show an overview of what is going on, e.g. stats and when
-things start or stop.
-
-· _errors_ - Show only warnings, criticals, errors or fatal events.
-__________________________________________________________________________________________________________
-
*-f, --follow*::
Follow status changes to daemons as they happen. This is a top level
view of what is happening. You will see the name for each daemon and a
diff --git a/docs/manpages/tracker-extract.1.txt b/docs/manpages/tracker-extract.1.txt
index c277dbb52..33dd524f9 100644
--- a/docs/manpages/tracker-extract.1.txt
+++ b/docs/manpages/tracker-extract.1.txt
@@ -25,21 +25,6 @@ For more information see the libtracker-extract reference documentation.
== OPTIONS
-*-v, --verbosity=<__LEVEL__>*::
- This sets the log verbosity for the extractor process.
-
-The possible _LEVEL_ options are:
-
-___________________________________________________________________
-· _debug_ - Show EVERYTHING, from debug messages to errors.
-
-· _detailed_ - Show enough detail to understand what is happening.
-
-· _minimal_ - Show an overview of what is going on
-
-· _errors_ - Show only warnings, criticals, errors or fatal events.
-___________________________________________________________________
-
*-o, --output-format=<__FORMAT__>*::
Choose which format to use to output results. Supported formats are
_sparql_, _turtle_ and _json-ld_.
diff --git a/docs/manpages/tracker-miner-fs.1.txt b/docs/manpages/tracker-miner-fs.1.txt
index 6ef1948f5..70ec7e87f 100644
--- a/docs/manpages/tracker-miner-fs.1.txt
+++ b/docs/manpages/tracker-miner-fs.1.txt
@@ -24,8 +24,6 @@ than one instance of this at the same time.
Show summary of options.
*-V, --version*::
Returns the version of this binary.
-*-v, --verbosity=\{0|1|2|3}*::
- Sets the logging level, 0=errors, 1=minimal, 2=detailed, 3=debug.
*-s, --initial-sleep=SECONDS*::
Sets the initial sleep time before crawling the file system is
started. If the *--no-daemon* option is used, this option is ignored.
diff --git a/docs/manpages/tracker-miner-rss.1.txt b/docs/manpages/tracker-miner-rss.1.txt
index 868c51204..8500d8a25 100644
--- a/docs/manpages/tracker-miner-rss.1.txt
+++ b/docs/manpages/tracker-miner-rss.1.txt
@@ -24,8 +24,6 @@ than one instance of this at the same time.
Show summary of options.
*-V, --version*::
Returns the version of this binary.
-*-v, --verbosity=\{0|1|2|3}*::
- Sets the logging level, 0=errors, 1=minimal, 2=detailed, 3=debug.
*-a, --add-feed=URL*::
Adds a feed to be indexed. This must be used with *--title*
option. An examples of such a URL would be:
diff --git a/docs/manpages/tracker-reset.1.txt b/docs/manpages/tracker-reset.1.txt
index 2a2293fb3..b0be1bbec 100644
--- a/docs/manpages/tracker-reset.1.txt
+++ b/docs/manpages/tracker-reset.1.txt
@@ -7,7 +7,7 @@ tracker-reset - Reset the index and configuration
== SYNOPSIS
-*tracker reset* [--filesystem | --rss] [--config] [--file _FILE_]
+*tracker reset* [--filesystem | --rss] [--file _FILE_]
== DESCRIPTION
@@ -30,8 +30,6 @@ hard reset option. This behaves as if Tracker was just installed.
recreate its cache from the filesystem when it restarts.
*--rss::
Removes data stored by tracker-miner-rss(1).
-*-c, --config*::
- Resets all configuration to its defaults.
*-f, --file _FILE_*::
Resets all indexed information about _FILE_, works recursively for
directories. Nothing will be done if _FILE_ is not currently indexed.
diff --git a/docs/manpages/tracker-writeback.1.txt b/docs/manpages/tracker-writeback.1.txt
index cb67d4363..bf25dff46 100644
--- a/docs/manpages/tracker-writeback.1.txt
+++ b/docs/manpages/tracker-writeback.1.txt
@@ -32,8 +32,6 @@ tracker-miner-fs configuration.
Show summary of options.
*-V, --version*::
Returns the version of this binary.
-*-v, --verbosity=\{0|1|2|3}*::
- Sets the logging level, 0=errors, 1=minimal, 2=detailed, 3=debug.
*-d, --disable-shutdown*::
Disable shutting down after 30 seconds of inactivity.
diff --git a/src/libtracker-miners-common/libtracker-miners-common.vapi
b/src/libtracker-miners-common/libtracker-miners-common.vapi
index cf5955921..6c9206f49 100644
--- a/src/libtracker-miners-common/libtracker-miners-common.vapi
+++ b/src/libtracker-miners-common/libtracker-miners-common.vapi
@@ -61,12 +61,6 @@ namespace Tracker {
public static void save_directory_list (void *object, string property, GLib.KeyFile key_file,
string group, string key);
}
- [CCode (cheader_filename = "libtracker-miners-common/tracker-common.h")]
- namespace Log {
- public bool init (int verbosity, out string used_filename);
- public void shutdown ();
- }
-
[CCode (cheader_filename = "libtracker-miners-common/tracker-locale.h")]
namespace Locale {
public void sanity_check ();
diff --git a/src/libtracker-miners-common/tracker-common.h b/src/libtracker-miners-common/tracker-common.h
index 3723c2838..dcf52f587 100644
--- a/src/libtracker-miners-common/tracker-common.h
+++ b/src/libtracker-miners-common/tracker-common.h
@@ -37,7 +37,6 @@
#include "tracker-fts-config.h"
#include "tracker-ioprio.h"
#include "tracker-language.h"
-#include "tracker-log.h"
#include "tracker-sched.h"
#include "tracker-seccomp.h"
#include "tracker-type-utils.h"
diff --git a/src/libtracker-miners-common/tracker-dbus.c b/src/libtracker-miners-common/tracker-dbus.c
index 32653a1a3..4192ea711 100644
--- a/src/libtracker-miners-common/tracker-dbus.c
+++ b/src/libtracker-miners-common/tracker-dbus.c
@@ -36,7 +36,6 @@
#endif
#include "tracker-dbus.h"
-#include "tracker-log.h"
/* How long clients can exist since last D-Bus call before being
* cleaned up.
diff --git a/src/libtracker-miners-common/tracker-file-utils.c
b/src/libtracker-miners-common/tracker-file-utils.c
index 9384960a3..219b5348e 100644
--- a/src/libtracker-miners-common/tracker-file-utils.c
+++ b/src/libtracker-miners-common/tracker-file-utils.c
@@ -38,7 +38,6 @@
#include <glib/gstdio.h>
#include <gio/gio.h>
-#include "tracker-log.h"
#include "tracker-file-utils.h"
#include "tracker-type-utils.h"
diff --git a/src/libtracker-miners-common/tracker-language.c b/src/libtracker-miners-common/tracker-language.c
index e93584b08..3e7c26017 100644
--- a/src/libtracker-miners-common/tracker-language.c
+++ b/src/libtracker-miners-common/tracker-language.c
@@ -28,7 +28,6 @@
#include <libstemmer.h>
#endif /* HAVE_LIBSTEMMER */
-#include "tracker-log.h"
#include "tracker-language.h"
typedef struct _TrackerLanguagePrivate TrackerLanguagePrivate;
diff --git a/src/libtracker-miners-common/tracker-type-utils.c
b/src/libtracker-miners-common/tracker-type-utils.c
index 8632ce42a..87c391289 100644
--- a/src/libtracker-miners-common/tracker-type-utils.c
+++ b/src/libtracker-miners-common/tracker-type-utils.c
@@ -30,7 +30,6 @@
#include <glib.h>
-#include "tracker-log.h"
#include "tracker-utils.h"
#include "tracker-type-utils.h"
diff --git a/src/miners/fs/tracker-config.c b/src/miners/fs/tracker-config.c
index 328dffeaf..656f705ea 100644
--- a/src/miners/fs/tracker-config.c
+++ b/src/miners/fs/tracker-config.c
@@ -37,7 +37,6 @@
#define CONFIG_PATH "/org/freedesktop/tracker/miner/files/"
/* Default values */
-#define DEFAULT_VERBOSITY 0
#define DEFAULT_INITIAL_SLEEP 15 /* 0->1000 */
#define DEFAULT_ENABLE_MONITORS TRUE
#define DEFAULT_THROTTLE 0 /* 0->20 */
@@ -99,7 +98,6 @@ enum {
PROP_0,
/* General */
- PROP_VERBOSITY,
PROP_INITIAL_SLEEP,
/* Monitors */
@@ -138,14 +136,6 @@ tracker_config_class_init (TrackerConfigClass *klass)
object_class->constructed = config_constructed;
/* General */
- g_object_class_install_property (object_class,
- PROP_VERBOSITY,
- g_param_spec_enum ("verbosity",
- "Log verbosity",
- "Log verbosity (0=errors, 1=minimal, 2=detailed,
3=debug)",
- TRACKER_TYPE_VERBOSITY,
- DEFAULT_VERBOSITY,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (object_class,
PROP_INITIAL_SLEEP,
g_param_spec_int ("initial-sleep",
@@ -314,9 +304,6 @@ config_set_property (GObject *object,
/* NOTE: We handle these because we have to be able
* to save these based on command line overrides.
*/
- case PROP_VERBOSITY:
- tracker_config_set_verbosity (config, g_value_get_enum (value));
- break;
case PROP_INITIAL_SLEEP:
tracker_config_set_initial_sleep (config, g_value_get_int (value));
break;
@@ -393,9 +380,6 @@ config_get_property (GObject *object,
switch (param_id) {
/* General */
- case PROP_VERBOSITY:
- g_value_set_enum (value, tracker_config_get_verbosity (config));
- break;
case PROP_INITIAL_SLEEP:
g_value_set_int (value, tracker_config_get_initial_sleep (config));
break;
@@ -638,8 +622,7 @@ config_constructed (GObject *object)
*
* NOTE: We need this. If we don't we can't have local
* settings which are *NOT* stored in the GSettings database.
- * We need this for overriding things like verbosity on start
- * up.
+ * We need this for overriding things on start up.
*/
if (G_LIKELY (!g_getenv ("TRACKER_USE_CONFIG_FILES"))) {
g_settings_delay (settings);
@@ -647,11 +630,10 @@ config_constructed (GObject *object)
/* Set up bindings:
*
- * What's interesting here is that 'verbosity' and
- * 'initial-sleep' are command line arguments that can be
- * overridden, so we don't update the config when we set them
- * from main() because it's a session configuration only, not
- * a permanent one. To do this we use the flag
+ * What's interesting here is that 'initial-sleep' is a
+ * command line argument that can be overridden, so we don't update the
+ * config when we set it from main() because it's a session configuration
+ * only, not a permanent one. To do this we use the flag
* G_SETTINGS_BIND_GET_NO_CHANGES.
*
* For the other settings, we don't bind the
@@ -663,7 +645,6 @@ config_constructed (GObject *object)
* file for convenience. But this is only necessary if the
* config is different to the default.
*/
- g_settings_bind (settings, "verbosity", object, "verbosity", G_SETTINGS_BIND_GET |
G_SETTINGS_BIND_GET_NO_CHANGES);
g_settings_bind (settings, "initial-sleep", object, "initial-sleep", G_SETTINGS_BIND_GET |
G_SETTINGS_BIND_GET_NO_CHANGES);
g_settings_bind (settings, "throttle", object, "throttle", G_SETTINGS_BIND_GET);
g_settings_bind (settings, "low-disk-space-limit", object, "low-disk-space-limit",
G_SETTINGS_BIND_GET);
@@ -728,14 +709,6 @@ tracker_config_new (void)
return config;
}
-gint
-tracker_config_get_verbosity (TrackerConfig *config)
-{
- g_return_val_if_fail (TRACKER_IS_CONFIG (config), DEFAULT_VERBOSITY);
-
- return g_settings_get_enum (G_SETTINGS (config), "verbosity");
-}
-
gint
tracker_config_get_initial_sleep (TrackerConfig *config)
{
@@ -892,16 +865,6 @@ tracker_config_get_removable_days_threshold (TrackerConfig *config)
return g_settings_get_int (G_SETTINGS (config), "removable-days-threshold");
}
-void
-tracker_config_set_verbosity (TrackerConfig *config,
- gint value)
-{
- g_return_if_fail (TRACKER_IS_CONFIG (config));
-
- g_settings_set_enum (G_SETTINGS (config), "verbosity", value);
- g_object_notify (G_OBJECT (config), "verbosity");
-}
-
void
tracker_config_set_initial_sleep (TrackerConfig *config,
gint value)
diff --git a/src/miners/fs/tracker-config.h b/src/miners/fs/tracker-config.h
index 9d70fbc74..97e171355 100644
--- a/src/miners/fs/tracker-config.h
+++ b/src/miners/fs/tracker-config.h
@@ -46,7 +46,6 @@ GType tracker_config_get_type (void) G_GNUC
TrackerConfig *tracker_config_new (void);
-gint tracker_config_get_verbosity (TrackerConfig *config);
gint tracker_config_get_initial_sleep (TrackerConfig *config);
gboolean tracker_config_get_enable_monitors (TrackerConfig *config);
gint tracker_config_get_throttle (TrackerConfig *config);
@@ -66,8 +65,6 @@ gint tracker_config_get_crawling_interval (TrackerConfi
gint tracker_config_get_removable_days_threshold (TrackerConfig *config);
gboolean tracker_config_get_enable_writeback (TrackerConfig *config);
-void tracker_config_set_verbosity (TrackerConfig *config,
- gint value);
void tracker_config_set_initial_sleep (TrackerConfig *config,
gint value);
diff --git a/src/miners/fs/tracker-main.c b/src/miners/fs/tracker-main.c
index a47862de4..e70d6d18f 100644
--- a/src/miners/fs/tracker-main.c
+++ b/src/miners/fs/tracker-main.c
@@ -782,7 +782,6 @@ main (gint argc, gchar *argv[])
TrackerMinerFilesIndex *miner_files_index;
GOptionContext *context;
GError *error = NULL;
- gchar *log_filename = NULL;
gboolean do_mtime_checking;
gboolean force_mtime_checking = FALSE;
TrackerMinerProxy *proxy;
@@ -850,21 +849,10 @@ main (gint argc, gchar *argv[])
/* Initialize logging */
config = tracker_config_new ();
- if (verbosity > -1) {
- tracker_config_set_verbosity (config, verbosity);
- }
-
if (initial_sleep > -1) {
tracker_config_set_initial_sleep (config, initial_sleep);
}
- tracker_log_init (tracker_config_get_verbosity (config),
- &log_filename);
- if (log_filename) {
- g_message ("Using log file:'%s'", log_filename);
- g_free (log_filename);
- }
-
sanity_check_option_values (config);
main_loop = g_main_loop_new (NULL, FALSE);
@@ -908,7 +896,6 @@ main (gint argc, gchar *argv[])
g_critical ("Couldn't create new Files miner: '%s'",
error ? error->message : "unknown error");
g_object_unref (config);
- tracker_log_shutdown ();
return EXIT_FAILURE;
}
@@ -921,7 +908,6 @@ main (gint argc, gchar *argv[])
g_error_free (error);
g_object_unref (config);
g_object_unref (miner_files);
- tracker_log_shutdown ();
return EXIT_FAILURE;
}
@@ -934,7 +920,6 @@ main (gint argc, gchar *argv[])
error ? error->message : "unknown error");
g_object_unref (config);
g_object_unref (miner_files);
- tracker_log_shutdown ();
return EXIT_FAILURE;
}
@@ -944,7 +929,6 @@ main (gint argc, gchar *argv[])
g_object_unref (miner_files);
tracker_writeback_shutdown ();
g_object_unref (config);
- tracker_log_shutdown ();
return EXIT_FAILURE;
}
@@ -1024,7 +1008,6 @@ main (gint argc, gchar *argv[])
tracker_domain_ontology_unref (domain_ontology);
tracker_writeback_shutdown ();
- tracker_log_shutdown ();
g_print ("\nOK\n\n");
diff --git a/src/miners/fs/tracker-storage.c b/src/miners/fs/tracker-storage.c
index 80f51503d..91360030b 100644
--- a/src/miners/fs/tracker-storage.c
+++ b/src/miners/fs/tracker-storage.c
@@ -24,8 +24,6 @@
#include <gio/gio.h>
#include <gio/gunixmounts.h>
-#include <libtracker-miners-common/tracker-log.h>
-
#include "tracker-storage.h"
/**
diff --git a/src/miners/rss/tracker-main.c b/src/miners/rss/tracker-main.c
index b0e45346a..f8140bbb6 100644
--- a/src/miners/rss/tracker-main.c
+++ b/src/miners/rss/tracker-main.c
@@ -32,17 +32,11 @@
#define DBUS_NAME_SUFFIX "Tracker3.Miner.RSS"
#define DBUS_PATH "/org/freedesktop/Tracker3/Miner/RSS"
-static gint verbosity = -1;
static gchar *add_feed;
static gchar *title;
static gchar *domain_ontology_name = NULL;
static GOptionEntry entries[] = {
- { "verbosity", 'v', 0,
- G_OPTION_ARG_INT, &verbosity,
- N_("Logging, 0 = errors only, "
- "1 = minimal, 2 = detailed and 3 = debug (default=0)"),
- NULL },
{ "add-feed", 'a', 0,
G_OPTION_ARG_STRING, &add_feed,
/* Translators: this is a "feed" as in RSS */
@@ -125,7 +119,6 @@ setup_connection_and_endpoint (TrackerDomainOntology *domain,
int
main (int argc, char **argv)
{
- gchar *log_filename;
GMainLoop *loop;
GOptionContext *context;
TrackerMinerRSS *miner;
@@ -221,12 +214,6 @@ main (int argc, char **argv)
return EXIT_SUCCESS;
}
- tracker_log_init (verbosity, &log_filename);
- if (log_filename != NULL) {
- g_message ("Using log file:'%s'", log_filename);
- g_free (log_filename);
- }
-
domain_ontology = tracker_domain_ontology_new (domain_ontology_name, NULL, &error);
if (error) {
g_critical ("Could not load domain ontology '%s': %s",
@@ -301,7 +288,6 @@ main (int argc, char **argv)
g_main_loop_run (loop);
- tracker_log_shutdown ();
g_main_loop_unref (loop);
g_object_unref (sparql_conn);
g_object_unref (endpoint);
diff --git a/src/tracker-extract/tracker-config.c b/src/tracker-extract/tracker-config.c
index ef33a380e..623cd0790 100644
--- a/src/tracker-extract/tracker-config.c
+++ b/src/tracker-extract/tracker-config.c
@@ -43,7 +43,6 @@ static void config_constructed (GObject *object);
enum {
PROP_0,
- PROP_VERBOSITY,
PROP_MAX_BYTES,
PROP_MAX_MEDIA_ART_WIDTH,
PROP_WAIT_FOR_MINER_FS,
@@ -62,15 +61,6 @@ tracker_config_class_init (TrackerConfigClass *klass)
object_class->constructed = config_constructed;
/* General */
- g_object_class_install_property (object_class,
- PROP_VERBOSITY,
- g_param_spec_enum ("verbosity",
- "Log verbosity",
- "Log verbosity (0=errors, 1=minimal, 2=detailed,
3=debug)",
- TRACKER_TYPE_VERBOSITY,
- TRACKER_VERBOSITY_ERRORS,
- G_PARAM_READWRITE));
-
g_object_class_install_property (object_class,
PROP_MAX_BYTES,
g_param_spec_int ("max-bytes",
@@ -100,18 +90,8 @@ config_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- TrackerConfig *config = TRACKER_CONFIG (object);
-
switch (param_id) {
- /* General */
- /* NOTE: We handle these because we have to be able
- * to save these based on command line overrides.
- */
- case PROP_VERBOSITY:
- tracker_config_set_verbosity (config, g_value_get_enum (value));
- break;
-
- /* We don't care about the others... we don't save anyway. */
+ /* We don't care about these... we don't save anyway. */
case PROP_MAX_BYTES:
case PROP_MAX_MEDIA_ART_WIDTH:
case PROP_WAIT_FOR_MINER_FS:
@@ -132,11 +112,6 @@ config_get_property (GObject *object,
TrackerConfig *config = TRACKER_CONFIG (object);
switch (param_id) {
- case PROP_VERBOSITY:
- g_value_set_enum (value,
- tracker_config_get_verbosity (config));
- break;
-
case PROP_MAX_BYTES:
g_value_set_int (value,
tracker_config_get_max_bytes (config));
@@ -178,23 +153,14 @@ config_constructed (GObject *object)
/* Set up bindings:
*
- * What's interesting here is that 'verbosity' and
- * 'initial-sleep' are command line arguments that can be
- * overridden, so we don't update the config when we set them
- * from main() because it's a session configuration only, not
- * a permanent one. To do this we use the flag
- * G_SETTINGS_BIND_GET_NO_CHANGES.
- *
- * For the other settings, we don't bind the
- * G_SETTINGS_BIND_SET because we don't want to save anything,
- * ever, we only want to know about updates to the settings as
+ * We don't bind the G_SETTINGS_BIND_SET because we don't want to save
+ * anything, ever, we only want to know about updates to the settings as
* they're changed externally. The only time this may be
* different is where we use the environment variable
* TRACKER_USE_CONFIG_FILES and we want to write a config
* file for convenience. But this is only necessary if the
* config is different to the default.
*/
- g_settings_bind (settings, "verbosity", object, "verbosity", G_SETTINGS_BIND_GET |
G_SETTINGS_BIND_GET_NO_CHANGES);
g_settings_bind (settings, "wait-for-miner-fs", object, "wait-for-miner-fs", G_SETTINGS_BIND_GET);
/* Cache settings accessed from extractor modules, we don't want
@@ -246,23 +212,6 @@ tracker_config_new (void)
return config;
}
-gint
-tracker_config_get_verbosity (TrackerConfig *config)
-{
- g_return_val_if_fail (TRACKER_IS_CONFIG (config), TRACKER_VERBOSITY_ERRORS);
-
- return g_settings_get_enum (G_SETTINGS (config), "verbosity");
-}
-
-void
-tracker_config_set_verbosity (TrackerConfig *config,
- gint value)
-{
- g_return_if_fail (TRACKER_IS_CONFIG (config));
-
- g_settings_set_enum (G_SETTINGS (config), "verbosity", value);
-}
-
gint
tracker_config_get_max_bytes (TrackerConfig *config)
{
diff --git a/src/tracker-extract/tracker-config.h b/src/tracker-extract/tracker-config.h
index 4996fe1fb..dd752bdb7 100644
--- a/src/tracker-extract/tracker-config.h
+++ b/src/tracker-extract/tracker-config.h
@@ -46,13 +46,9 @@ struct TrackerConfigClass {
GType tracker_config_get_type (void) G_GNUC_CONST;
TrackerConfig *tracker_config_new (void);
-gint tracker_config_get_verbosity (TrackerConfig *config);
gint tracker_config_get_max_bytes (TrackerConfig *config);
gboolean tracker_config_get_wait_for_miner_fs (TrackerConfig *config);
-void tracker_config_set_verbosity (TrackerConfig *config,
- gint value);
-
G_END_DECLS
#endif /* __TRACKER_EXTRACT_CONFIG_H__ */
diff --git a/src/tracker-extract/tracker-main.c b/src/tracker-extract/tracker-main.c
index 1c022a60c..7fce181d0 100644
--- a/src/tracker-extract/tracker-main.c
+++ b/src/tracker-extract/tracker-main.c
@@ -65,7 +65,6 @@
static GMainLoop *main_loop;
-static gint verbosity = -1;
static gchar *filename;
static gchar *mime_type;
static gchar *force_module;
@@ -77,11 +76,6 @@ static guint shutdown_timeout_id = 0;
static TrackerConfig *config;
static GOptionEntry entries[] = {
- { "verbosity", 'v', 0,
- G_OPTION_ARG_INT, &verbosity,
- N_("Logging, 0 = errors only, "
- "1 = minimal, 2 = detailed and 3 = debug (default = 0)"),
- NULL },
{ "file", 'f', 0,
G_OPTION_ARG_FILENAME, &filename,
N_("File to extract metadata for"),
@@ -178,8 +172,6 @@ static void
sanity_check_option_values (TrackerConfig *config)
{
g_message ("General options:");
- g_message (" Verbosity ............................ %d",
- tracker_config_get_verbosity (config));
g_message (" Max bytes (per file) ................. %d",
tracker_config_get_max_bytes (config));
}
@@ -286,7 +278,6 @@ main (int argc, char *argv[])
TrackerExtract *extract;
TrackerDecorator *decorator;
TrackerExtractController *controller;
- gchar *log_filename = NULL;
GMainLoop *my_main_loop;
GDBusConnection *connection;
TrackerMinerProxy *proxy;
@@ -358,16 +349,6 @@ main (int argc, char *argv[])
config = tracker_config_new ();
/* Extractor command line arguments */
- if (verbosity > -1) {
- tracker_config_set_verbosity (config, verbosity);
- }
-
- tracker_log_init (tracker_config_get_verbosity (config), &log_filename);
- if (log_filename != NULL) {
- g_message ("Using log file:'%s'", log_filename);
- g_free (log_filename);
- }
-
sanity_check_option_values (config);
/* Set conditions when we use stand alone settings */
@@ -379,7 +360,6 @@ main (int argc, char *argv[])
if (!extract) {
g_object_unref (config);
- tracker_log_shutdown ();
return EXIT_FAILURE;
}
@@ -401,7 +381,6 @@ main (int argc, char *argv[])
if (error) {
g_critical ("Could not start decorator: %s\n", error->message);
g_object_unref (config);
- tracker_log_shutdown ();
return EXIT_FAILURE;
}
@@ -411,7 +390,6 @@ main (int argc, char *argv[])
g_error_free (error);
g_object_unref (decorator);
g_object_unref (config);
- tracker_log_shutdown ();
return EXIT_FAILURE;
}
@@ -481,8 +459,6 @@ main (int argc, char *argv[])
g_object_unref (connection);
tracker_domain_ontology_unref (domain_ontology);
- tracker_log_shutdown ();
-
g_object_unref (config);
return EXIT_SUCCESS;
diff --git a/src/tracker-writeback/meson.build b/src/tracker-writeback/meson.build
index d58262919..321e1491e 100644
--- a/src/tracker-writeback/meson.build
+++ b/src/tracker-writeback/meson.build
@@ -28,8 +28,6 @@ foreach module : modules
endforeach
tracker_writeback_sources = [
- 'tracker-config.c',
- 'tracker-config.h',
'tracker-writeback-file.c',
'tracker-writeback-file.h',
'tracker-writeback-module.c',
diff --git a/src/tracker-writeback/tracker-main.c b/src/tracker-writeback/tracker-main.c
index b371031cd..2eddd5be1 100644
--- a/src/tracker-writeback/tracker-main.c
+++ b/src/tracker-writeback/tracker-main.c
@@ -24,10 +24,7 @@
#include <glib/gi18n.h>
-#include <libtracker-miners-common/tracker-log.h>
-
#include "tracker-writeback.h"
-#include "tracker-config.h"
#define ABOUT \
"Tracker " PACKAGE_VERSION "\n"
@@ -65,24 +62,14 @@ static GOptionEntry entries[] = {
};
-static void
-sanity_check_option_values (TrackerConfig *config)
-{
- g_message ("General options:");
- g_message (" Verbosity ............................ %d",
- tracker_config_get_verbosity (config));
-}
-
int
main (int argc,
char *argv[])
{
- TrackerConfig *config;
TrackerController *controller;
GOptionContext *context;
GMainLoop *loop;
GError *error = NULL;
- gchar *log_filename;
guint shutdown_timeout;
/* Set up locale */
@@ -106,22 +93,6 @@ main (int argc,
return EXIT_SUCCESS;
}
- /* Initialize logging */
- config = tracker_config_new ();
-
- if (verbosity > -1) {
- tracker_config_set_verbosity (config, verbosity);
- }
-
- tracker_log_init (tracker_config_get_verbosity (config),
- &log_filename);
- if (log_filename != NULL) {
- g_message ("Using log file:'%s'", log_filename);
- g_free (log_filename);
- }
-
- sanity_check_option_values (config);
-
if (disable_shutdown) {
shutdown_timeout = 0;
} else {
@@ -141,14 +112,9 @@ main (int argc,
loop = g_main_loop_new (NULL, FALSE);
g_main_loop_run (loop);
-
- tracker_log_shutdown ();
-
g_object_unref (controller);
g_main_loop_unref (loop);
- g_object_unref (config);
-
return EXIT_SUCCESS;
}
diff --git a/src/tracker/meson.build b/src/tracker/meson.build
index 5c1cb2612..fbf1f6171 100644
--- a/src/tracker/meson.build
+++ b/src/tracker/meson.build
@@ -10,7 +10,6 @@ modules = [
common_sources = [
'tracker-miner-manager.c',
- 'tracker-config.c',
'tracker-dbus.c',
'tracker-process.c',
]
diff --git a/src/tracker/tracker-daemon.c b/src/tracker/tracker-daemon.c
index 969a9ff9b..05cd363ff 100644
--- a/src/tracker/tracker-daemon.c
+++ b/src/tracker/tracker-daemon.c
@@ -35,7 +35,6 @@
#include <libtracker-miners-common/tracker-common.h>
#include <libtracker-sparql/tracker-sparql.h>
-#include "tracker-config.h"
#include "tracker-process.h"
#include "tracker-dbus.h"
#include "tracker-miner-manager.h"
@@ -72,8 +71,6 @@ static gboolean list_miners_available;
static gboolean pause_details;
static gboolean list_processes;
-static gchar *set_log_verbosity;
-static gboolean get_log_verbosity;
static gboolean start;
static gboolean kill_miners;
static gboolean terminate_miners;
@@ -90,8 +87,6 @@ static gchar *restore;
list_miners_available || \
pause_details) || \
(list_processes || \
- get_log_verbosity || \
- set_log_verbosity || \
start || \
kill_miners || \
terminate_miners || \
@@ -165,12 +160,6 @@ static GOptionEntry entries[] = {
{ "start", 's', 0, G_OPTION_ARG_NONE, &start,
N_("Starts miners"),
NULL },
- { "set-log-verbosity", 0, 0, G_OPTION_ARG_STRING, &set_log_verbosity,
- N_("Sets the logging verbosity to LEVEL (“debug”, “detailed”, “minimal”, “errors”) for all
processes"),
- N_("LEVEL") },
- { "get-log-verbosity", 0, 0, G_OPTION_ARG_NONE, &get_log_verbosity,
- N_("Show logging values in terms of log verbosity for each process"),
- NULL },
{ NULL }
};
@@ -702,63 +691,6 @@ miner_pause_details (void)
return EXIT_SUCCESS;
}
-
-
-
-
-
-
-
-
-
-
-
-
-inline static const gchar *
-verbosity_to_string (TrackerVerbosity verbosity)
-{
- GType type;
- GEnumClass *enum_class;
- GEnumValue *enum_value;
-
- type = tracker_verbosity_get_type ();
- enum_class = G_ENUM_CLASS (g_type_class_peek (type));
- enum_value = g_enum_get_value (enum_class, verbosity);
-
- if (!enum_value) {
- return "unknown";
- }
-
- return enum_value->value_nick;
-}
-
-inline static void
-tracker_gsettings_print_verbosity (GSList *all,
- gint longest,
- gboolean miners)
-{
- GSList *l;
-
- for (l = all; l; l = l->next) {
- ComponentGSettings *c;
- TrackerVerbosity v;
-
- c = l->data;
-
- if (c->is_miner == miners) {
- continue;
- }
-
- v = g_settings_get_enum (c->settings, "verbosity");
-
- g_print (" %-*.*s: %s\n",
- longest,
- longest,
- c->name,
- verbosity_to_string (v));
- }
-}
-
static gint
daemon_run (void)
{
@@ -985,8 +917,6 @@ daemon_run (void)
/* Processes */
GError *error = NULL;
- gpointer verbosity_type_enum_class_pointer = NULL;
- TrackerVerbosity set_log_verbosity_value = TRACKER_VERBOSITY_ERRORS;
/* Constraints */
@@ -996,44 +926,6 @@ daemon_run (void)
return EXIT_FAILURE;
}
- if (get_log_verbosity && set_log_verbosity) {
- g_printerr ("%s\n",
- _("You can not use the --get-logging and --set-logging arguments together"));
- return EXIT_FAILURE;
- }
-
- if (set_log_verbosity) {
- if (g_ascii_strcasecmp (set_log_verbosity, "debug") == 0) {
- set_log_verbosity_value = TRACKER_VERBOSITY_DEBUG;
- } else if (g_ascii_strcasecmp (set_log_verbosity, "detailed") == 0) {
- set_log_verbosity_value = TRACKER_VERBOSITY_DETAILED;
- } else if (g_ascii_strcasecmp (set_log_verbosity, "minimal") == 0) {
- set_log_verbosity_value = TRACKER_VERBOSITY_MINIMAL;
- } else if (g_ascii_strcasecmp (set_log_verbosity, "errors") == 0) {
- set_log_verbosity_value = TRACKER_VERBOSITY_ERRORS;
- } else {
- g_printerr ("%s\n",
- _("Invalid log verbosity, try “debug”, “detailed”, “minimal” or
“errors”"));
- return EXIT_FAILURE;
- }
- }
-
- if (get_log_verbosity || set_log_verbosity) {
- GType etype;
-
- /* Since we don't reference this enum anywhere, we do
- * it here to make sure it exists when we call
- * g_type_class_peek(). This wouldn't be necessary if
- * it was a param in a GObject for example.
- *
- * This does mean that we are leaking by 1 reference
- * here and should clean it up, but it doesn't grow so
- * this is acceptable.
- */
- etype = tracker_verbosity_get_type ();
- verbosity_type_enum_class_pointer = g_type_class_ref (etype);
- }
-
if (list_processes) {
GSList *pids, *l;
gchar *str;
@@ -1073,82 +965,6 @@ daemon_run (void)
return retval;
}
- /* Deal with logging changes AFTER the config may have been
- * reset, this way users can actually use --remove-config with
- * the --set-logging switch.
- */
- if (get_log_verbosity) {
- GSList *all;
- gint longest = 0;
-
- all = tracker_gsettings_get_all (&longest);
-
- if (!all) {
- return EXIT_FAILURE;
- }
-
- g_print ("%s:\n", _("Components"));
- tracker_gsettings_print_verbosity (all, longest, TRUE);
- g_print ("\n");
-
- /* Miners */
- g_print ("%s (%s):\n",
- _("Miners"),
- _("Only those with config listed"));
- tracker_gsettings_print_verbosity (all, longest, FALSE);
- g_print ("\n");
-
- tracker_gsettings_free (all);
- return EXIT_SUCCESS;
- }
-
- if (set_log_verbosity) {
- GSList *all;
- gchar *str;
- gint longest = 0;
-
- all = tracker_gsettings_get_all (&longest);
-
- if (!all) {
- return EXIT_FAILURE;
- }
-
- str = g_strdup_printf (_("Setting log verbosity for all components to “%s”…"),
set_log_verbosity);
- g_print ("%s\n", str);
- g_print ("\n");
- g_free (str);
-
- tracker_gsettings_set_all (all, set_log_verbosity_value);
- tracker_gsettings_free (all);
-
- /* We free to make sure we get new settings and that
- * they're saved properly.
- */
- all = tracker_gsettings_get_all (&longest);
-
- if (!all) {
- return EXIT_FAILURE;
- }
-
- g_print ("%s:\n", _("Components"));
- tracker_gsettings_print_verbosity (all, longest, TRUE);
- g_print ("\n");
-
- /* Miners */
- g_print ("%s (%s):\n",
- _("Miners"),
- _("Only those with config listed"));
- tracker_gsettings_print_verbosity (all, longest, FALSE);
- g_print ("\n");
-
- tracker_gsettings_free (all);
- return EXIT_SUCCESS;
- }
-
- if (verbosity_type_enum_class_pointer) {
- g_type_class_unref (verbosity_type_enum_class_pointer);
- }
-
if (start) {
TrackerMinerManager *manager;
GSList *miners, *l;
diff --git a/src/tracker/tracker-extract.c b/src/tracker/tracker-extract.c
index 5b97136bc..d4b5220f0 100644
--- a/src/tracker/tracker-extract.c
+++ b/src/tracker/tracker-extract.c
@@ -28,9 +28,6 @@
#include <libtracker-miners-common/tracker-common.h>
-#include "tracker-config.h"
-
-static gchar *verbosity;
static gchar *output_format = "turtle";
static gchar **filenames;
@@ -38,9 +35,6 @@ static gchar **filenames;
((filenames && g_strv_length (filenames) > 0))
static GOptionEntry entries[] = {
- { "verbosity", 'v', 0, G_OPTION_ARG_STRING, &verbosity,
- N_("Sets the logging verbosity to LEVEL (“debug”, “detailed”, “minimal”, “errors”) for all
processes"),
- N_("LEVEL") },
{ "output-format", 'o', 0, G_OPTION_ARG_STRING, &output_format,
N_("Output results format: “sparql”, “turtle” or “json-ld”"),
N_("FORMAT") },
@@ -52,22 +46,17 @@ static GOptionEntry entries[] = {
static gint
-extract_files (TrackerVerbosity verbosity,
- char *output_format)
+extract_files (char *output_format)
{
char **p;
char *tracker_extract_path;
- char verbosity_str[2];
GError *error = NULL;
- snprintf (verbosity_str, 2, "%i", verbosity);
-
tracker_extract_path = g_build_filename(LIBEXECDIR, "tracker-extract-3", NULL);
for (p = filenames; *p; p++) {
char *argv[] = {tracker_extract_path,
"--output-format", output_format,
- "--verbosity", verbosity_str,
"--file", *p, NULL };
g_spawn_sync(NULL, argv, NULL, G_SPAWN_DEFAULT, NULL, NULL, NULL, NULL, NULL, &error);
@@ -89,25 +78,7 @@ extract_files (TrackerVerbosity verbosity,
static int
extract_run (void)
{
- TrackerVerbosity verbosity_level = TRACKER_VERBOSITY_ERRORS;
-
- if (verbosity) {
- if (g_ascii_strcasecmp (verbosity, "debug") == 0) {
- verbosity_level = TRACKER_VERBOSITY_DEBUG;
- } else if (g_ascii_strcasecmp (verbosity, "detailed") == 0) {
- verbosity_level = TRACKER_VERBOSITY_DETAILED;
- } else if (g_ascii_strcasecmp (verbosity, "minimal") == 0) {
- verbosity_level = TRACKER_VERBOSITY_MINIMAL;
- } else if (g_ascii_strcasecmp (verbosity, "errors") == 0) {
- verbosity_level = TRACKER_VERBOSITY_ERRORS;
- } else {
- g_printerr ("%s\n",
- _("Invalid log verbosity, try “debug”, “detailed”, “minimal” or
“errors”"));
- return EXIT_FAILURE;
- }
- }
-
- return extract_files (verbosity_level, output_format);
+ return extract_files (output_format);
}
static int
diff --git a/src/tracker/tracker-reset.c b/src/tracker/tracker-reset.c
index 6f29b65cd..18abe9fdf 100644
--- a/src/tracker/tracker-reset.c
+++ b/src/tracker/tracker-reset.c
@@ -32,19 +32,16 @@
#include <libtracker-sparql/tracker-sparql.h>
#include "tracker-process.h"
-#include "tracker-config.h"
#include "tracker-color.h"
#include "tracker-miner-manager.h"
static gboolean files = FALSE;
static gboolean rss = FALSE;
-static gboolean remove_config;
static gchar *filename = NULL;
#define RESET_OPTIONS_ENABLED() \
(files || \
rss || \
- remove_config || \
filename)
static GOptionEntry entries[] = {
@@ -54,9 +51,6 @@ static GOptionEntry entries[] = {
{ "rss", 'r', 0, G_OPTION_ARG_NONE, &rss,
N_("Remove RSS indexer database"),
NULL },
- { "config", 'c', 0, G_OPTION_ARG_NONE, &remove_config,
- N_("Remove all configuration files so they are re-generated on next start"),
- NULL },
{ "file", 'f', 0, G_OPTION_ARG_FILENAME, &filename,
N_("Erase indexed information about a file, works recursively for directories"),
N_("FILE") },
@@ -223,47 +217,6 @@ reset_run (void)
g_free (dir);
}
- if (remove_config) {
- GSList *all, *l;
-
- g_print ("%s\n", _("Resetting existing configuration…"));
-
- all = tracker_gsettings_get_all (NULL);
-
- if (!all) {
- return EXIT_FAILURE;
- }
-
- for (l = all; l; l = l->next) {
- ComponentGSettings *c = l->data;
- gchar **keys, **p;
-
- if (!c) {
- continue;
- }
-
- g_print (" %s\n", c->name);
-
- keys = g_settings_schema_list_keys (c->schema);
- for (p = keys; p && *p; p++) {
- g_print (" %s\n", *p);
- g_settings_reset (c->settings, *p);
- }
-
- if (keys) {
- g_strfreev (keys);
- }
-
- g_settings_apply (c->settings);
- }
-
- g_settings_sync ();
-
- tracker_gsettings_free (all);
-
- return EXIT_SUCCESS;
- }
-
return EXIT_SUCCESS;
}
diff --git a/src/tracker/tracker-search.c b/src/tracker/tracker-search.c
index 4e1a3084c..4a5bc76fe 100644
--- a/src/tracker/tracker-search.c
+++ b/src/tracker/tracker-search.c
@@ -1714,8 +1714,6 @@ main (int argc, const char **argv)
setlocale (LC_ALL, "");
- tracker_log_init (3, NULL);
-
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
diff --git a/src/tracker/tracker-status.c b/src/tracker/tracker-status.c
index 26ef4a24e..65aa5d509 100644
--- a/src/tracker/tracker-status.c
+++ b/src/tracker/tracker-status.c
@@ -32,7 +32,6 @@
#include <libtracker-miners-common/tracker-common.h>
#include <libtracker-sparql/tracker-sparql.h>
-#include "tracker-config.h"
#include "tracker-miner-manager.h"
#define STATUS_OPTIONS_ENABLED() \
@@ -168,9 +167,7 @@ collect_debug (void)
* 1. Package details, e.g. version.
* 2. Disk size, space left, type (SSD/etc)
* 3. Size of dataset (tracker-stats), size of databases
- * 4. Current configuration (libtracker-fts, tracker-miner-fs, tracker-extract)
- * All txt files in ~/.cache/
- * 5. Statistics about data (tracker-stats)
+ * 4. Statistics about data (tracker-stats)
*/
GDir *d;
@@ -229,43 +226,6 @@ collect_debug (void)
g_dir_close (d);
g_print ("\n");
- /* 4. Current configuration (libtracker-fts, tracker-miner-fs, tracker-extract)
- * All txt files in ~/.cache/
- */
- GSList *all, *l;
-
- g_print ("[%s]\n", _("Configuration"));
-
- all = tracker_gsettings_get_all (NULL);
-
- if (all) {
- for (l = all; l; l = l->next) {
- ComponentGSettings *c = l->data;
- gchar **keys, **p;
-
- if (!c) {
- continue;
- }
-
- keys = g_settings_schema_list_keys (c->schema);
- for (p = keys; p && *p; p++) {
- GVariant *v;
- gchar *printed;
-
- v = g_settings_get_value (c->settings, *p);
- printed = g_variant_print (v, FALSE);
- g_print ("%s.%s: %s\n", c->name, *p, printed);
- g_free (printed);
- g_variant_unref (v);
- }
- }
-
- tracker_gsettings_free (all);
- } else {
- g_print ("** %s **\n", _("No configuration was found"));
- }
- g_print ("\n\n");
-
g_print ("[%s]\n", _("States"));
for (d = g_dir_open (data_dir, 0, NULL); d != NULL;) {
diff --git a/tests/functional-tests/fixtures.py b/tests/functional-tests/fixtures.py
index 59b139912..097796d0b 100644
--- a/tests/functional-tests/fixtures.py
+++ b/tests/functional-tests/fixtures.py
@@ -269,7 +269,7 @@ def get_tracker_extract_jsonld_output(extra_env, filename, mime_type=None):
"""
tracker_extract = os.path.join(cfg.TRACKER_EXTRACT_PATH)
- command = [tracker_extract, '--verbosity=0', '--output-format=json-ld', '--file', str(filename)]
+ command = [tracker_extract, '--output-format=json-ld', '--file', str(filename)]
if mime_type is not None:
command.extend(['--mime', mime_type])
diff --git a/tests/libtracker-extract/tracker-module-manager-test.c
b/tests/libtracker-extract/tracker-module-manager-test.c
index 992f6ee75..f3f40907e 100644
--- a/tests/libtracker-extract/tracker-module-manager-test.c
+++ b/tests/libtracker-extract/tracker-module-manager-test.c
@@ -76,10 +76,7 @@ test_extract_rules (void)
int
main (int argc, char **argv)
{
- gchar *used_filename;
-
g_test_init (&argc, &argv, NULL);
- tracker_log_init (3, &used_filename);
init_module_manager ();
g_test_add_func ("/libtracker-extract/module-manager/extract-rules",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
