From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Wed, 6 Jan 2016 22:27:44 +0000 (+0000)
Subject: Do not treat autolearn errors as fatal
X-Git-Tag: 1.1.0~114
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a834efa3617a01e0eb0ebf36b86f6e2c79bdc46;p=thirdparty%2Frspamd.git

Do not treat autolearn errors as fatal
---

diff --git a/src/libserver/task.c b/src/libserver/task.c
index bee7df22dd..fe7d490c20 100644
--- a/src/libserver/task.c
+++ b/src/libserver/task.c
@@ -466,8 +466,11 @@ rspamd_task_process (struct rspamd_task *task, guint stages)
 					task->flags & RSPAMD_TASK_FLAG_LEARN_SPAM,
 					task->cfg->lua_state, task->classifier,
 					st, &stat_error)) {
+
+				if (!(task->flags & RSPAMD_TASK_FLAG_LEARN_AUTO)) {
+					task->err = stat_error;
+				}
 				msg_err_task ("learn error: %e", stat_error);
-				task->err = stat_error;
 				task->processed_stages |= RSPAMD_TASK_STAGE_DONE;
 			}
 		}
diff --git a/src/libserver/task.h b/src/libserver/task.h
index 7ede95b317..d64d6461c0 100644
--- a/src/libserver/task.h
+++ b/src/libserver/task.h
@@ -115,6 +115,7 @@ enum rspamd_task_stage {
 #define RSPAMD_TASK_FLAG_ALREADY_LEARNED (1 << 15)
 #define RSPAMD_TASK_FLAG_LEARN_SPAM (1 << 16)
 #define RSPAMD_TASK_FLAG_LEARN_HAM (1 << 17)
+#define RSPAMD_TASK_FLAG_LEARN_AUTO (1 << 18)
 
 #define RSPAMD_TASK_IS_SKIPPED(task) (((task)->flags & RSPAMD_TASK_FLAG_SKIP))
 #define RSPAMD_TASK_IS_JSON(task) (((task)->flags & RSPAMD_TASK_FLAG_JSON))
diff --git a/src/libstat/stat_process.c b/src/libstat/stat_process.c
index 6635f8aa74..4045951eb9 100644
--- a/src/libstat/stat_process.c
+++ b/src/libstat/stat_process.c
@@ -707,6 +707,10 @@ rspamd_stat_check_autolearn (struct rspamd_task *task)
 		}
 	}
 
+	if (ret) {
+		task->flags |= RSPAMD_TASK_FLAG_LEARN_AUTO;
+	}
+
 	return ret;
 }