Add backend option for statfiles, remove legacy

diff --git a/src/libserver/cfg_file.h b/src/libserver/cfg_file.h
index 1beb51055ba21a5d6f561bbdd87ad11ecb3285c0..7338b90688b4a651fbd3adf0c84aa836edfc41fe 100644 (file)
--- a/src/libserver/cfg_file.h
+++ b/src/libserver/cfg_file.h
@@ -137,6 +137,8 @@ struct rspamd_statfile_config {
        gchar *label;                                   /**< label of this statfile                                                             */
        ucl_object_t *opts;                             /**< other options                                                                              */
        gboolean is_spam;                               /**< spam flag                                                                                  */
+       const gchar *backend;                                                   /**< name of statfile's backend                                                 */
+       gpointer data;                                                                  /**< opaque data                                                                                */
 };
 
 /**
@@ -216,8 +218,6 @@ struct rspamd_config {
        gboolean log_color;                             /**< output colors for console output                   */
        gboolean log_extended;                          /**< log extended information                                                   */
 
-       guint32 statfile_sync_interval;                 /**< synchronization interval                                                   */
-       guint32 statfile_sync_timeout;                  /**< synchronization timeout                                                    */
        gboolean mlock_statfile_pool;                   /**< use mlock (2) for locking statfiles                                */
 
        gboolean delivery_enable;                       /**< is delivery agent is enabled                                               */

diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c
index 921464219021fb24bbe4827ca2fe206cb57ad45a..c512217e0ac2a3121cb417a05a34f0b2196b17fb 100644 (file)
--- a/src/libserver/cfg_rcl.c
+++ b/src/libserver/cfg_rcl.c
@@ -1275,16 +1275,6 @@ rspamd_rcl_config_init (void)
                rspamd_rcl_parse_struct_string,
                G_STRUCT_OFFSET (struct rspamd_config, filters_str),
                0);
-       rspamd_rcl_add_default_handler (sub,
-               "sync_interval",
-               rspamd_rcl_parse_struct_time,
-               G_STRUCT_OFFSET (struct rspamd_config, statfile_sync_interval),
-               RSPAMD_CL_FLAG_TIME_INTEGER);
-       rspamd_rcl_add_default_handler (sub,
-               "sync_timeout",
-               rspamd_rcl_parse_struct_time,
-               G_STRUCT_OFFSET (struct rspamd_config, statfile_sync_timeout),
-               RSPAMD_CL_FLAG_TIME_INTEGER);
        rspamd_rcl_add_default_handler (sub,
                "max_diff",
                rspamd_rcl_parse_struct_integer,
@@ -1399,6 +1389,11 @@ rspamd_rcl_config_init (void)
                rspamd_rcl_parse_struct_boolean,
                G_STRUCT_OFFSET (struct rspamd_statfile_config, is_spam),
                0);
+       rspamd_rcl_add_default_handler (ssub,
+               "backend",
+               rspamd_rcl_parse_struct_string,
+               G_STRUCT_OFFSET (struct rspamd_statfile_config, backend),
+               0);
 
        /**
         * Composites handler

diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c
index c9a9555b1d036f8f83758153365ece41e83809bb..3a0186c89db96c12a9ae8edef3b86f0193df313b 100644 (file)
--- a/src/libserver/cfg_utils.c
+++ b/src/libserver/cfg_utils.c
@@ -148,9 +148,6 @@ rspamd_config_defaults (struct rspamd_config *cfg)
        /* 16 sockets per DNS server */
        cfg->dns_io_per_server = 16;
 
-       cfg->statfile_sync_interval = 60000;
-       cfg->statfile_sync_timeout = 20000;
-
        /* 20 Kb */
        cfg->max_diff = 20480;