From 7b04b58f6942d8b1d22de5fdae166359c702c628 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Thu, 25 Feb 2016 11:08:24 +0000 Subject: [PATCH] Some fixes to the previous commit --- src/libstat/backends/redis_backend.c | 2 ++ src/libstat/learn_cache/redis_cache.c | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/libstat/backends/redis_backend.c b/src/libstat/backends/redis_backend.c index 6e1767e8d..ae47eef9f 100644 --- a/src/libstat/backends/redis_backend.c +++ b/src/libstat/backends/redis_backend.c @@ -1194,6 +1194,8 @@ rspamd_redis_learn_tokens (struct rspamd_task *task, GPtrArray *tokens, double_to_tv (rt->ctx->timeout, &tv); event_add (&rt->timeout_event, &tv); + rspamd_redis_maybe_auth (rt->ctx, rt->redis); + if (rt->stcf->clcf->flags & RSPAMD_FLAG_CLASSIFIER_INTEGER) { redis_cmd = "HINCRBY"; } diff --git a/src/libstat/learn_cache/redis_cache.c b/src/libstat/learn_cache/redis_cache.c index e76e6b2b6..b48aeecea 100644 --- a/src/libstat/learn_cache/redis_cache.c +++ b/src/libstat/learn_cache/redis_cache.c @@ -195,7 +195,7 @@ rspamd_stat_cache_redis_init (struct rspamd_stat_ctx *ctx, { struct rspamd_redis_cache_ctx *cache_ctx; struct rspamd_statfile_config *stf = st->stcf; - const ucl_object_t *elt, *relt; + const ucl_object_t *elt, *relt, *telt; cache_ctx = g_slice_alloc0 (sizeof (*cache_ctx)); @@ -213,36 +213,36 @@ rspamd_stat_cache_redis_init (struct rspamd_stat_ctx *ctx, return NULL; } - elt = ucl_object_lookup (st->classifier->cfg->opts, "password"); - if (elt) { - cache_ctx->password = ucl_object_tostring (elt); + telt = ucl_object_lookup (st->classifier->cfg->opts, "password"); + if (telt) { + cache_ctx->password = ucl_object_tostring (telt); } else { cache_ctx->password = NULL; } - elt = ucl_object_lookup_any (st->classifier->cfg->opts, + telt = ucl_object_lookup_any (st->classifier->cfg->opts, "db", "database", NULL); - if (elt) { - cache_ctx->dbname = ucl_object_tostring (elt); + if (telt) { + cache_ctx->dbname = ucl_object_tostring (telt); } else { cache_ctx->dbname = NULL; } } else { - elt = ucl_object_lookup (stf->opts, "password"); - if (elt) { - cache_ctx->password = ucl_object_tostring (elt); + telt = ucl_object_lookup (stf->opts, "password"); + if (telt) { + cache_ctx->password = ucl_object_tostring (telt); } else { cache_ctx->password = NULL; } - elt = ucl_object_lookup_any (stf->opts, + telt = ucl_object_lookup_any (stf->opts, "db", "database", NULL); - if (elt) { - cache_ctx->dbname = ucl_object_tostring (elt); + if (telt) { + cache_ctx->dbname = ucl_object_tostring (telt); } else { cache_ctx->dbname = NULL; -- 2.39.5