diff options
Diffstat (limited to 'src/lua/lua_redis.c')
| -rw-r--r-- | src/lua/lua_redis.c | 39 |
1 files changed, 32 insertions, 7 deletions
diff --git a/src/lua/lua_redis.c b/src/lua/lua_redis.c index f39168a27..003538b1a 100644 --- a/src/lua/lua_redis.c +++ b/src/lua/lua_redis.c @@ -114,6 +114,7 @@ struct lua_redis_userdata { #define LUA_REDIS_ASYNC (1 << 0) #define LUA_REDIS_TEXTDATA (1 << 1) #define LUA_REDIS_TERMINATED (1 << 2) +#define LUA_REDIS_NO_POOL (1 << 3) #define IS_ASYNC(ctx) ((ctx)->flags & LUA_REDIS_ASYNC) struct lua_redis_request_specific_userdata { @@ -198,7 +199,17 @@ lua_redis_dtor (struct lua_redis_ctx *ctx) ud->terminated = 1; ac = ud->ctx; ud->ctx = NULL; - rspamd_redis_pool_release_connection (ud->pool, ac, !is_successful); + + if (!is_successful) { + rspamd_redis_pool_release_connection (ud->pool, ac, + RSPAMD_REDIS_RELEASE_FATAL); + } + else { + rspamd_redis_pool_release_connection (ud->pool, ac, + (ctx->flags & LUA_REDIS_NO_POOL) ? + RSPAMD_REDIS_RELEASE_ENFORCE : RSPAMD_REDIS_RELEASE_DEFAULT); + } + } LL_FOREACH_SAFE (ud->specific, cur, tmp) { @@ -456,7 +467,9 @@ lua_redis_callback (redisAsyncContext *c, gpointer r, gpointer priv) ud->ctx = NULL; if (ac) { - rspamd_redis_pool_release_connection (ud->pool, ac, FALSE); + rspamd_redis_pool_release_connection (ud->pool, ac, + (ctx->flags & LUA_REDIS_NO_POOL) ? + RSPAMD_REDIS_RELEASE_ENFORCE : RSPAMD_REDIS_RELEASE_DEFAULT); } } @@ -596,7 +609,8 @@ lua_redis_callback_sync (redisAsyncContext *ac, gpointer r, gpointer priv) * This will call all callbacks pending so the entire context * will be destructed */ - rspamd_redis_pool_release_connection (sp_ud->c->pool, ac, TRUE); + rspamd_redis_pool_release_connection (sp_ud->c->pool, ac, + RSPAMD_REDIS_RELEASE_FATAL); } result->result_ref = luaL_ref (L, LUA_REGISTRYINDEX); @@ -646,7 +660,8 @@ lua_redis_timeout_sync (EV_P_ ev_timer *w, int revents) * This will call all callbacks pending so the entire context * will be destructed */ - rspamd_redis_pool_release_connection (sp_ud->c->pool, ac, TRUE); + rspamd_redis_pool_release_connection (sp_ud->c->pool, ac, + RSPAMD_REDIS_RELEASE_FATAL); } } @@ -679,7 +694,8 @@ lua_redis_timeout (EV_P_ ev_timer *w, int revents) * This will call all callbacks pending so the entire context * will be destructed */ - rspamd_redis_pool_release_connection (sp_ud->c->pool, ac, TRUE); + rspamd_redis_pool_release_connection (sp_ud->c->pool, ac, + RSPAMD_REDIS_RELEASE_FATAL); } REDIS_RELEASE (ctx); @@ -904,6 +920,13 @@ rspamd_lua_redis_prepare_connection (lua_State *L, gint *pcbref, gboolean is_asy } lua_pop (L, 1); + lua_pushstring (L, "no_pool"); + lua_gettable (L, -2); + if (!!lua_toboolean (L, -1)) { + flags |= LUA_REDIS_NO_POOL; + } + lua_pop (L, 1); + lua_pop (L, 1); /* table */ if (session && rspamd_session_blocked (session)) { @@ -962,7 +985,8 @@ rspamd_lua_redis_prepare_connection (lua_State *L, gint *pcbref, gboolean is_asy if (ud->ctx) { msg_err_task_check ("cannot connect to redis: %s", ud->ctx->errstr); - rspamd_redis_pool_release_connection (ud->pool, ud->ctx, TRUE); + rspamd_redis_pool_release_connection (ud->pool, ud->ctx, + RSPAMD_REDIS_RELEASE_FATAL); ud->ctx = NULL; } else { @@ -1065,7 +1089,8 @@ lua_redis_make_request (lua_State *L) } else { msg_info ("call to redis failed: %s", ud->ctx->errstr); - rspamd_redis_pool_release_connection (ud->pool, ud->ctx, TRUE); + rspamd_redis_pool_release_connection (ud->pool, ud->ctx, + RSPAMD_REDIS_RELEASE_FATAL); ud->ctx = NULL; REDIS_RELEASE (ctx); ret = FALSE; |