[Fix] Fix an old issue with order of destruction race between redis pool and lua

1 files changed, 6 insertions, 5 deletions

diff --git a/src/libserver/redis_pool.cxx b/src/libserver/redis_pool.cxx
index 19acaa828..0bbfa55de 100644
--- a/src/libserver/redis_pool.cxx
+++ b/src/libserver/redis_pool.cxx
@@ -244,13 +244,13 @@ public:
 		conns_by_ctx.emplace(ctx, conn);
 	}
 
-	~redis_pool() {
-		/*
-		 * XXX: this will prevent hiredis to unregister connections that
-		 * are already destroyed during redisAsyncFree...
-		 */
+	/* Hack to prevent Redis callbacks to be executed */
+	auto prepare_to_die() -> void
+	{
 		wanna_die = true;
 	}
+
+	~redis_pool() {}
 };
 
 
@@ -612,6 +612,7 @@ rspamd_redis_pool_destroy(void *p)
 {
 	auto *pool = reinterpret_cast<class rspamd::redis_pool *>(p);
 
+	pool->prepare_to_die();
 	delete pool;
 }