Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 13 Sep 2019 08:31:03 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r511916 - in head/mail/dovecot-fts-xapian: . files
Message-ID:  <201909130831.x8D8V38X097147@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: bapt
Date: Fri Sep 13 08:31:03 2019
New Revision: 511916
URL: https://svnweb.freebsd.org/changeset/ports/511916

Log:
  Add a patch to reduce verbosity of doveadm when calling the xapian backend

Added:
  head/mail/dovecot-fts-xapian/files/patch-reduce-verbosity   (contents, props changed)
Modified:
  head/mail/dovecot-fts-xapian/Makefile

Modified: head/mail/dovecot-fts-xapian/Makefile
==============================================================================
--- head/mail/dovecot-fts-xapian/Makefile	Fri Sep 13 07:45:37 2019	(r511915)
+++ head/mail/dovecot-fts-xapian/Makefile	Fri Sep 13 08:31:03 2019	(r511916)
@@ -2,6 +2,7 @@
 
 PORTNAME=	fts-xapian
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	mail
 PKGNAMEPREFIX=	dovecot-
 

Added: head/mail/dovecot-fts-xapian/files/patch-reduce-verbosity
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/dovecot-fts-xapian/files/patch-reduce-verbosity	Fri Sep 13 08:31:03 2019	(r511916)
@@ -0,0 +1,74 @@
+diff --git src/fts-backend-xapian-functions.cpp src/fts-backend-xapian-functions.cpp
+index e7f8324..ed0ab1a 100644
+--- src/fts-backend-xapian-functions.cpp
++++ src/fts-backend-xapian-functions.cpp
+@@ -35,7 +35,6 @@ class XQuerySet
+ 	bool item_neg; // for the term
+ 	long qsize;
+ 	long limit;
+-	bool display;
+ 
+ 	XQuerySet()
+ 	{
+@@ -45,7 +44,6 @@ class XQuerySet
+ 		header=NULL;
+                 text=NULL;
+ 		global_neg=false;
+-		display=false;
+ 	}
+ 
+ 	XQuerySet(bool is_and, bool is_neg, long l)
+@@ -57,7 +55,6 @@ class XQuerySet
+ 		text=NULL;
+ 		global_and=is_and;
+ 		global_neg=is_neg;
+-		display=true;
+ 	}
+ 
+ 	~XQuerySet()
+@@ -293,7 +290,7 @@ class XQuerySet
+ 
+ 		char *s = i_strdup(get_string().c_str());
+ 	
+-		if(display) { i_info("FTS Xapian: Query= %s",s); }
++		i_debug("FTS Xapian: Query= %s",s);
+ 
+ 		qp->set_database(*db);
+ 	
+@@ -452,7 +449,7 @@ static void fts_backend_xapian_oldbox(struct xapian_fts_backend *backend)
+ 		}
+         	/* End Performance calculator*/
+ 	
+-                i_info("FTS Xapian: Done indexing '%s' (%ld msgs in %ld ms, rate: %.1f)",backend->oldbox,backend->perf_nb,dt,r);
++                i_debug("FTS Xapian: Done indexing '%s' (%ld msgs in %ld ms, rate: %.1f)",backend->oldbox,backend->perf_nb,dt,r);
+                 i_free(backend->oldbox);
+                 backend->oldbox=NULL;
+         }
+diff --git src/fts-backend-xapian.cpp src/fts-backend-xapian.cpp
+index 5ff83d0..d55852c 100644
+--- src/fts-backend-xapian.cpp
++++ src/fts-backend-xapian.cpp
+@@ -442,12 +442,12 @@ static int fts_backend_xapian_lookup(struct fts_backend *_backend, struct mailbo
+ 
+ 	if((flags & FTS_LOOKUP_FLAG_AND_ARGS) != 0)
+ 	{
+-		i_info("FTS Xapian: FLAG=AND");
++		i_debug("FTS Xapian: FLAG=AND");
+ 		is_and=true;
+ 	}
+ 	else
+ 	{
+-		i_info("FTS Xapian: FLAG=OR");
++		i_debug("FTS Xapian: FLAG=OR");
+ 	}
+ 
+ 	XQuerySet * qs = new XQuerySet(is_and,false,backend->partial);
+@@ -480,7 +480,7 @@ static int fts_backend_xapian_lookup(struct fts_backend *_backend, struct mailbo
+ 	/* Performance calc */
+         gettimeofday(&tp, NULL);
+         dt = tp.tv_sec * 1000 + tp.tv_usec / 1000 - dt;
+-	i_info("FTS Xapian: %ld results in %ld ms",n,dt);	
++	i_debug("FTS Xapian: %ld results in %ld ms",n,dt);
+ 
+ 	return 0;
+ }

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909130831.x8D8V38X097147>