]> source.dussan.org Git - rspamd.git/commitdiff
Revert "[Fix] Postpone lua state destruction to allow lua dtors to be used"
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Fri, 26 Jul 2019 17:16:42 +0000 (18:16 +0100)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Fri, 26 Jul 2019 17:16:42 +0000 (18:16 +0100)
This reverts commit 5275cae7517be59e0b451dbfacf5e5887feff619.

src/libserver/cfg_utils.c

index 4348f794017f9844e5d66fff5166c2bc4e57bc8f..525a72a7406201f7ff4bd55c1ec66ed3dc250cb2 100644 (file)
@@ -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) {