]> source.dussan.org Git - rspamd.git/commitdiff
[Minor] Some more reload fixes
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Wed, 7 Aug 2019 18:55:13 +0000 (19:55 +0100)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Wed, 7 Aug 2019 18:55:13 +0000 (19:55 +0100)
src/rspamd.c

index 2dc50c5d5e6e2c29608a70c53b6533fca1a7d126..458d3d0835cf1ad4435b18bbf74fb163addb635a 100644 (file)
@@ -308,6 +308,8 @@ reread_config (struct rspamd_main *rspamd_main)
        else {
                msg_info_main ("replacing config");
                REF_RELEASE (old_cfg);
+               rspamd_main->cfg->rspamd_user = rspamd_user;
+               rspamd_main->cfg->rspamd_group = rspamd_group;
                /* Here, we can do post actions with the existing config */
                /*
                 * As some rules are defined in lua, we need to process them, then init
@@ -317,12 +319,9 @@ reread_config (struct rspamd_main *rspamd_main)
                rspamd_init_filters (tmp_cfg, TRUE);
 
                /* Do post-load actions */
-               rspamd_config_post_load (tmp_cfg, load_opts);
+               rspamd_config_post_load (tmp_cfg,
+                               load_opts|RSPAMD_CONFIG_INIT_POST_LOAD_LUA|RSPAMD_CONFIG_INIT_PRELOAD_MAPS);
                msg_info_main ("config has been reread successfully");
-               rspamd_map_preload (rspamd_main->cfg);
-
-               rspamd_main->cfg->rspamd_user = rspamd_user;
-               rspamd_main->cfg->rspamd_group = rspamd_group;
        }
 }