[tracker-miners/wip/carlosg/parallel-installable: 33/41] tracker: Clean up CLI tool's internal process handling

[Carlos Garnacho <carlosg src gnome org>]

commit 983f5b913f5d3929e12e038ef6ab2e5e32a7a4ba
Author: Carlos Garnacho <carlosg gnome org>
Date:   Tue Mar 3 14:27:34 2020 +0100

    tracker: Clean up CLI tool's internal process handling
    
    We don't need to look for stores anymore, so clean up that code.

 src/tracker/tracker-process.c | 16 ++++------------
 src/tracker/tracker-process.h |  2 --
 src/tracker/tracker-reset.c   |  2 +-
 3 files changed, 5 insertions(+), 15 deletions(-)
---
diff --git a/src/tracker/tracker-process.c b/src/tracker/tracker-process.c
index 130c50fa5..f22fb9022 100644
--- a/src/tracker/tracker-process.c
+++ b/src/tracker/tracker-process.c
@@ -316,13 +316,9 @@ tracker_process_stop (TrackerProcessTypes daemons_to_term,
                basename = pd->cmd;
                pid = pd->pid;
                
-               if (daemons_to_term != TRACKER_PROCESS_TYPE_NONE) {
-                       if ((daemons_to_term == TRACKER_PROCESS_TYPE_STORE &&
-                            !g_str_has_suffix (basename, "tracker-store")) ||
-                           (daemons_to_term == TRACKER_PROCESS_TYPE_MINERS &&
-                            !strstr (basename, "tracker-miner"))) {
+               if (daemons_to_term == TRACKER_PROCESS_TYPE_MINERS) {
+                       if (!strstr (basename, "tracker-miner"))
                                continue;
-                       }
 
                        if (kill (pid, SIGTERM) == -1) {
                                const gchar *errstr = g_strerror (errno);
@@ -337,13 +333,9 @@ tracker_process_stop (TrackerProcessTypes daemons_to_term,
                                g_print ("  %s\n", str);
                                g_free (str);
                        }
-               } else if (daemons_to_kill != TRACKER_PROCESS_TYPE_NONE) {
-                       if ((daemons_to_kill == TRACKER_PROCESS_TYPE_STORE &&
-                            !g_str_has_suffix (basename, "tracker-store")) ||
-                           (daemons_to_kill == TRACKER_PROCESS_TYPE_MINERS &&
-                            !strstr (basename, "tracker-miner"))) {
+               } else if (daemons_to_kill == TRACKER_PROCESS_TYPE_MINERS) {
+                       if (!strstr (basename, "tracker-miner"))
                                continue;
-                       }
 
                        if (kill (pid, SIGKILL) == -1) {
                                const gchar *errstr = g_strerror (errno);
diff --git a/src/tracker/tracker-process.h b/src/tracker/tracker-process.h
index 1432da3b8..326d64113 100644
--- a/src/tracker/tracker-process.h
+++ b/src/tracker/tracker-process.h
@@ -31,8 +31,6 @@ typedef struct {
 
 typedef enum {
        TRACKER_PROCESS_TYPE_NONE,
-       TRACKER_PROCESS_TYPE_ALL,
-       TRACKER_PROCESS_TYPE_STORE,
        TRACKER_PROCESS_TYPE_MINERS
 } TrackerProcessTypes;
 
diff --git a/src/tracker/tracker-reset.c b/src/tracker/tracker-reset.c
index bccd2e600..cd56b225f 100644
--- a/src/tracker/tracker-reset.c
+++ b/src/tracker/tracker-reset.c
@@ -230,7 +230,7 @@ reset_run (void)
 
        /* KILL processes first... */
        if (hard_reset || soft_reset) {
-               tracker_process_stop (TRACKER_PROCESS_TYPE_NONE, TRACKER_PROCESS_TYPE_ALL);
+               tracker_process_stop (TRACKER_PROCESS_TYPE_NONE, TRACKER_PROCESS_TYPE_MINERS);
        }
 
        if (hard_reset || soft_reset) {