diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-08-30 16:56:09 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2016-08-30 16:56:09 +0100 |
| commit | 6030bd28ff3f08cd798ab2c30a726accbaa0596a (patch) | |
| tree | 295a680c6d7d913052261f9544603102be00aecc | |
| parent | b5b0137de78bd9ea656adb64633fe91d210e14f6 (diff) | |
| download | rspamd-6030bd28ff3f08cd798ab2c30a726accbaa0596a.tar.gz rspamd-6030bd28ff3f08cd798ab2c30a726accbaa0596a.zip | |
[Minor] Initialize redis pool
| -rw-r--r-- | src/controller.c | 2 | ||||
| -rw-r--r-- | src/libserver/cfg_file.h | 3 | ||||
| -rw-r--r-- | src/libserver/cfg_utils.c | 1 | ||||
| -rw-r--r-- | src/worker.c | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/src/controller.c b/src/controller.c index 7280d9951..2b19a7dd7 100644 --- a/src/controller.c +++ b/src/controller.c @@ -2836,6 +2836,8 @@ start_controller_worker (struct rspamd_worker *worker) rspamd_upstreams_library_config (worker->srv->cfg, worker->srv->cfg->ups_ctx, ctx->ev_base, ctx->resolver->r); + rspamd_redis_pool_config (worker->srv->cfg->redis_pool, + worker->srv->cfg, ctx->ev_base); /* Maps events */ rspamd_map_watch (worker->srv->cfg, ctx->ev_base, ctx->resolver); rspamd_symbols_cache_start_refresh (worker->srv->cfg->cache, ctx->ev_base); diff --git a/src/libserver/cfg_file.h b/src/libserver/cfg_file.h index 48c3c812f..7ce7f98a4 100644 --- a/src/libserver/cfg_file.h +++ b/src/libserver/cfg_file.h @@ -16,6 +16,8 @@ #include "libserver/re_cache.h" #include "ref.h" #include "libutil/radix.h" +#include "monitored.h" +#include "redis_pool.h" #define DEFAULT_BIND_PORT 11333 #define DEFAULT_CONTROL_PORT 11334 @@ -406,6 +408,7 @@ struct rspamd_config { struct rspamd_external_libs_ctx *libs_ctx; /**< context for external libraries */ struct rspamd_monitored_ctx *monitored_ctx; /**< context for monitored resources */ + struct rspamd_redis_pool *redis_pool; /**< redis connectiosn pool */ struct rspamd_re_cache *re_cache; /**< static regexp cache */ diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c index decd33156..a50986c80 100644 --- a/src/libserver/cfg_utils.c +++ b/src/libserver/cfg_utils.c @@ -166,6 +166,7 @@ rspamd_config_new (void) cfg->ssl_ciphers = "HIGH:!aNULL:!kRSA:!PSK:!SRP:!MD5:!RC4"; cfg->max_message = DEFAULT_MAX_MESSAGE; cfg->monitored_ctx = rspamd_monitored_ctx_init (); + cfg->redis_pool = rspamd_redis_pool_init (); REF_INIT_RETAIN (cfg, rspamd_config_free); diff --git a/src/worker.c b/src/worker.c index 362849136..0e16922f3 100644 --- a/src/worker.c +++ b/src/worker.c @@ -589,6 +589,8 @@ start_worker (struct rspamd_worker *worker) ctx->ev_base, ctx->resolver->r); rspamd_monitored_ctx_config (worker->srv->cfg->monitored_ctx, worker->srv->cfg, ctx->ev_base, ctx->resolver->r); + rspamd_redis_pool_config (worker->srv->cfg->redis_pool, + worker->srv->cfg, ctx->ev_base); /* XXX: stupid default */ ctx->keys_cache = rspamd_keypair_cache_new (256); |