From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Thu, 14 Dec 2017 19:49:08 +0000 (+0200)
Subject: fts: Code cleanup
X-Git-Tag: 2.3.0.rc1~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=993b1b96f38df4970fb2c41d47b660a8c64bda98;p=thirdparty%2Fdovecot%2Fcore.git

fts: Code cleanup
---

diff --git a/src/plugins/fts/fts-build-mail.c b/src/plugins/fts/fts-build-mail.c
index 1cbaefe68b..d98a3d6162 100644
--- a/src/plugins/fts/fts-build-mail.c
+++ b/src/plugins/fts/fts-build-mail.c
@@ -615,12 +615,16 @@ int fts_build_mail(struct fts_backend_update_context *update_ctx,
 	bool may_need_retry;
 
 	T_BEGIN {
-		for (;;) {
-			ret = fts_build_mail_real(update_ctx, mail,
-						  &retriable_err_msg, &may_need_retry);
-			if (!may_need_retry || (--attempts == 0)) {
-				if (may_need_retry)
-					i_info("%s - ignoring", retriable_err_msg);
+		while ((ret = fts_build_mail_real(update_ctx, mail,
+						  &retriable_err_msg,
+						  &may_need_retry)) < 0 &&
+		       may_need_retry) {
+			if (--attempts == 0) {
+				/* Log this as info instead of as error,
+				   because e.g. Tika doesn't differentiate
+				   between temporary errors and invalid
+				   document input. */
+				i_info("%s - ignoring", retriable_err_msg);
 				break;
 			}
 		}