[tracker/f21] Backport upstream patch to restrict the amount of data that is logged for

[Debarshi Ray]

commit 5222babec3ac0a6de51870e107b77a33a07d5475
Author: Debarshi Ray <debarshir at gnome.org>
Date:   Tue Jan 13 16:10:38 2015 +0100

    Backport upstream patch to restrict the amount of data that is logged for
    
      errors (GNOME #735406)

 ...miner-Restrict-the-amount-of-data-that-is.patch |   59 ++++++++++++++++++++
 tracker.spec                                       |   10 +++-
 2 files changed, 68 insertions(+), 1 deletions(-)
---
diff --git a/0001-libtracker-miner-Restrict-the-amount-of-data-that-is.patch b/0001-libtracker-miner-Restrict-the-amount-of-data-that-is.patch
new file mode 100644
index 0000000..3b7de55
--- /dev/null
+++ b/0001-libtracker-miner-Restrict-the-amount-of-data-that-is.patch
@@ -0,0 +1,59 @@
+From 59745984f91fa0c5e464c312c3a142fe3bd3b853 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir at gnome.org>
+Date: Tue, 13 Jan 2015 14:51:50 +0100
+Subject: [PATCH] libtracker-miner: Restrict the amount of data that is logged
+ for errors
+
+SPARQL update strings can be very long if the entire text of a document
+is being stored. Dumping these huge strings to the log eats up disk
+space and makes them harder to follow.
+
+However, often, the occurence of such an error indicates a broken
+extractor. In those cases, knowing part of the SPARQL can help in
+identifying the file that triggered the error.
+
+Usually the "nie:plainTextContent" property is the last one in the
+string, so we truncate the error messages at the first occurance of
+this property to achieve the best of both worlds.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=735406
+---
+ src/libtracker-miner/tracker-decorator.c | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/src/libtracker-miner/tracker-decorator.c b/src/libtracker-miner/tracker-decorator.c
+index b8978d8..781e4de 100644
+--- a/src/libtracker-miner/tracker-decorator.c
++++ b/src/libtracker-miner/tracker-decorator.c
+@@ -19,6 +19,8 @@
+ 
+ #include "config.h"
+ 
++#include <string.h>
++
+ #include "tracker-decorator.h"
+ #include "tracker-decorator-internal.h"
+ #include "tracker-priority-queue.h"
+@@ -365,9 +367,17 @@ decorator_commit_cb (GObject      *object,
+ 			child_error = g_ptr_array_index (errors, i);
+ 
+ 			if (child_error) {
++				gchar *msg, *p;
++
++				msg = g_strdup (g_ptr_array_index (sparql, i));
++				p = strstr (msg, "nie:plainTextContent");
++				if (p != NULL)
++					*p = '\0';
++
+ 				g_warning ("Task %d, error: %s", i, child_error->message);
+-				g_warning ("Sparql update was:\n%s\n",
+-				           (gchar *) g_ptr_array_index (sparql, i));
++				g_warning ("Sparql update was:\n%s\n", msg);
++
++				g_free (msg);
+ 			}
+ 		}
+ 
+-- 
+2.1.0
+
diff --git a/tracker.spec b/tracker.spec
index e1392dc..bfc4421 100644
--- a/tracker.spec
+++ b/tracker.spec
@@ -14,7 +14,7 @@
 
 Name:           tracker
 Version:        1.2.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Desktop-neutral search tool and indexer
 
 Group:          Applications/System
@@ -29,6 +29,9 @@ Patch1:         tracker-0.15-onlyshowin.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1133924
 Patch2:         0001-tracker-extract-Avoid-the-use-of-setrlimit-it-s-caus.patch
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=735406
+Patch3:         0001-libtracker-miner-Restrict-the-amount-of-data-that-is.patch
+
 BuildRequires:  desktop-file-utils
 BuildRequires:  firefox
 BuildRequires:  giflib-devel
@@ -172,6 +175,7 @@ This package contains the documentation for tracker
 
 %patch1 -p1 -b .onlyshowin
 %patch2 -p1 -b .rlimits
+%patch3 -p1 -b .restrict-logs
 
 ## nuke unwanted rpaths, see also
 ## https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
@@ -313,6 +317,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Tue Jan 13 2015 Debarshi Ray <rishi at fedoraproject.org> - 1.2.5-2
+- Backport upstream patch to restrict the amount of data that is logged for
+  errors (GNOME #735406)
+
 * Wed Dec 10 2014 David King <amigadave at amigadave.com> - 1.2.5-1
 - Update to 1.2.5