diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-11-04 13:17:43 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-11-04 13:17:43 +0000 |
| commit | 041d2e56ebeb880a423eb7f8434cdab4f7efaf68 (patch) | |
| tree | bfe5553c7b21bbe00aeec9c93ff9f52cde4f9af8 /src/rspamd.c | |
| parent | 3383065b190c63dfaa3ef837572b1b43f80ae841 (diff) | |
| download | rspamd-041d2e56ebeb880a423eb7f8434cdab4f7efaf68.tar.gz rspamd-041d2e56ebeb880a423eb7f8434cdab4f7efaf68.zip | |
[Rework] Simplify lua path initialization
Diffstat (limited to 'src/rspamd.c')
| -rw-r--r-- | src/rspamd.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/rspamd.c b/src/rspamd.c index d301f7449..6d20fe50c 100644 --- a/src/rspamd.c +++ b/src/rspamd.c @@ -68,8 +68,7 @@ static gboolean load_rspamd_config (struct rspamd_main *rspamd_main, struct rspamd_config *cfg, gboolean init_modules, enum rspamd_post_load_options opts, - gboolean reload, - GHashTable *vars); + gboolean reload); /* Control socket */ static gint control_fd; @@ -289,7 +288,7 @@ reread_config (struct rspamd_main *rspamd_main) if (!load_rspamd_config (rspamd_main, tmp_cfg, TRUE, RSPAMD_CONFIG_INIT_VALIDATE|RSPAMD_CONFIG_INIT_SYMCACHE, - TRUE, ucl_vars)) { + TRUE)) { rspamd_main->cfg = old_cfg; rspamd_log_close_priv (rspamd_main->logger, rspamd_main->workers_uid, @@ -871,8 +870,7 @@ static gboolean load_rspamd_config (struct rspamd_main *rspamd_main, struct rspamd_config *cfg, gboolean init_modules, enum rspamd_post_load_options opts, - gboolean reload, - GHashTable *vars) + gboolean reload) { cfg->compiled_modules = modules; cfg->compiled_workers = workers; @@ -901,7 +899,7 @@ load_rspamd_config (struct rspamd_main *rspamd_main, rspamd_lua_post_load_config (cfg); if (init_modules) { - rspamd_init_filters (cfg, reload, vars); + rspamd_init_filters (cfg, reload); } /* Do post-load actions */ @@ -1278,7 +1276,7 @@ main (gint argc, gchar **argv, gchar **env) if (config_test || dump_cache) { if (!load_rspamd_config (rspamd_main, rspamd_main->cfg, FALSE, 0, - FALSE, ucl_vars)) { + FALSE)) { exit (EXIT_FAILURE); } @@ -1301,7 +1299,7 @@ main (gint argc, gchar **argv, gchar **env) /* Load config */ if (!load_rspamd_config (rspamd_main, rspamd_main->cfg, TRUE, - RSPAMD_CONFIG_LOAD_ALL, FALSE, ucl_vars)) { + RSPAMD_CONFIG_LOAD_ALL, FALSE)) { exit (EXIT_FAILURE); } |