From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 26 Jul 2019 17:16:42 +0000 (+0100)
Subject: Revert "[Fix] Postpone lua state destruction to allow lua dtors to be used"
X-Git-Tag: 2.0~483
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=27a72f0afe0398cd20685a02d612d4dd043487a2;p=rspamd.git

Revert "[Fix] Postpone lua state destruction to allow lua dtors to be used"

This reverts commit 5275cae7517be59e0b451dbfacf5e5887feff619.
---

diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c
index 4348f7940..525a72a74 100644
--- a/src/libserver/cfg_utils.c
+++ b/src/libserver/cfg_utils.c
@@ -296,6 +296,11 @@ rspamd_config_free (struct rspamd_config *cfg)
 	rspamd_upstreams_library_unref (cfg->ups_ctx);
 	g_ptr_array_free (cfg->c_modules, TRUE);
 
+	if (cfg->lua_state && cfg->own_lua_state) {
+		lua_thread_pool_free (cfg->lua_thread_pool);
+		lua_close (cfg->lua_state);
+	}
+
 #ifdef WITH_HIREDIS
 	if (cfg->redis_pool) {
 		rspamd_redis_pool_destroy (cfg->redis_pool);
@@ -314,11 +319,6 @@ rspamd_config_free (struct rspamd_config *cfg)
 		g_free (cfg->checksum);
 	}
 
-	if (cfg->lua_state && cfg->own_lua_state) {
-		lua_thread_pool_free (cfg->lua_thread_pool);
-		lua_close (cfg->lua_state);
-	}
-
 	REF_RELEASE (cfg->libs_ctx);
 
 	DL_FOREACH_SAFE (cfg->log_pipes, lp, ltmp) {