From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 24 Apr 2017 14:29:31 +0000 (+0100)
Subject: [Feature] Allow storing bayes tokens in Redis
X-Git-Tag: 1.6.0~330
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6336f4e4794fb3c492154fbc8898baf070b32b62;p=rspamd.git

[Feature] Allow storing bayes tokens in Redis
---

diff --git a/src/libstat/backends/redis_backend.c b/src/libstat/backends/redis_backend.c
index 25007d883..f51272247 100644
--- a/src/libstat/backends/redis_backend.c
+++ b/src/libstat/backends/redis_backend.c
@@ -44,6 +44,7 @@ struct redis_stat_ctx {
 	const gchar *dbname;
 	gdouble timeout;
 	gboolean enable_users;
+	gboolean store_tokens;
 	gint cbref_user;
 };
 
@@ -161,8 +162,6 @@ rspamd_redis_expand_object (const gchar *pattern,
 		}
 	}
 
-
-
 	/* Length calculation */
 	while (*p) {
 		switch (state) {
@@ -423,6 +422,35 @@ rspamd_redis_tokens_to_query (struct rspamd_task *task,
 				return NULL;
 			}
 
+			if (rt->ctx->store_tokens) {
+				/*
+				 * We also store tokens in form
+				 * HSET arg0_keys <token_id> "token_string"
+				 * ZINCRBY arg0_zlist <token_id> 1.0
+				 */
+				if (tok->t1 && tok->t2) {
+					redisAsyncCommand (rt->redis, NULL, NULL,
+							"HSET %b_tokens %b %b:%b",
+							arg1, (size_t)larg1,
+							n0, (size_t)l0,
+							tok->t1->begin, tok->t1->len,
+							tok->t2->begin, tok->t2->len);
+				}
+				else if (tok->t1) {
+					redisAsyncCommand (rt->redis, NULL, NULL,
+							"HSET %b_tokens %b %b",
+							arg1, (size_t)larg1,
+							n0, (size_t)l0,
+							tok->t1->begin, tok->t1->len);
+				}
+
+				redisAsyncCommand (rt->redis, NULL, NULL,
+						"ZINCRBY %b_z %b %b",
+						arg1, (size_t)larg1,
+						n1, (size_t)l1,
+						n0, (size_t)l0);
+			}
+
 			out->len = 0;
 		}
 		else {
@@ -1052,6 +1080,14 @@ rspamd_redis_try_ucl (struct redis_stat_ctx *backend,
 		backend->password = NULL;
 	}
 
+	elt = ucl_object_lookup (obj, "store_tokens");
+	if (elt) {
+		backend->store_tokens = ucl_object_toboolean (elt);
+	}
+	else {
+		backend->store_tokens = FALSE;
+	}
+
 	elt = ucl_object_lookup_any (obj, "db", "database", "dbname", NULL);
 	if (elt) {
 		backend->dbname = ucl_object_tostring (elt);