]> source.dussan.org Git - rspamd.git/commitdiff
[Fix] Fix reloading on SIGHUP
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Thu, 18 Aug 2016 12:20:48 +0000 (13:20 +0100)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Thu, 18 Aug 2016 12:20:48 +0000 (13:20 +0100)
src/libserver/cfg_utils.c
src/rspamd.c

index bb8acc33d662f89abfee6f6b91ec033caad69608..b0ae4a3aec86a4f212f5c6c8fdc2e666de50dacb 100644 (file)
@@ -1364,7 +1364,7 @@ rspamd_init_filters (struct rspamd_config *cfg, bool reconfig)
 
                        if (reconfig) {
                                (void)mod->module_reconfig_func (cfg);
-                               msg_debug_config ("reconfig of %s", mod->name);
+                               msg_info_config ("reconfig of %s", mod->name);
                        }
                        else {
                                (void)mod->module_config_func (cfg);
index 5692e315b14461dca6624063eb5a063edf29a90d..056de6e127531f84c89300ef8e0c63fb48d294ca 100644 (file)
@@ -280,7 +280,8 @@ reread_config (struct rspamd_main *rspamd_main)
        /* Save some variables */
        tmp_cfg->cfg_name = cfg_file;
 
-       if (!load_rspamd_config (rspamd_main, tmp_cfg, FALSE, RSPAMD_CONFIG_INIT_VALIDATE)) {
+       if (!load_rspamd_config (rspamd_main, tmp_cfg, TRUE,
+                       RSPAMD_CONFIG_INIT_VALIDATE|RSPAMD_CONFIG_INIT_SYMCACHE)) {
                rspamd_set_logger (rspamd_main->cfg, g_quark_try_string (
                                "main"), rspamd_main);
                msg_err_main ("cannot parse new config file, revert to old one");
@@ -297,7 +298,6 @@ reread_config (struct rspamd_main *rspamd_main)
                        rspamd_main->cfg->log_level = G_LOG_LEVEL_DEBUG;
                }
 
-               rspamd_init_filters (rspamd_main->cfg, TRUE);
                msg_info_main ("config has been reread successfully");
        }
 }