]> source.dussan.org Git - rspamd.git/commitdiff
Unbreak the rest.
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Mon, 27 Jul 2015 13:59:41 +0000 (14:59 +0100)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Mon, 27 Jul 2015 13:59:41 +0000 (14:59 +0100)
src/libstat/backends/redis.c
src/libstat/backends/sqlite3_backend.c

index f25b88b7ec901e655669b07e26398f932010b4ba..38d6c7a3a13f501e5aa1e3f05bb9e8cdad7a8193 100644 (file)
@@ -294,14 +294,16 @@ rspamd_redis_init (struct rspamd_stat_ctx *ctx, struct rspamd_config *cfg)
        while (cur) {
                clf = cur->data;
 
-               curst = clf->statfiles;
-               while (curst) {
-                       stf = curst->data;
-
-                       /*
-                        * By default, all statfiles are treated as mmaped files
-                        */
-                       if (stf->backend != NULL && strcmp (stf->backend, REDIS_BACKEND_TYPE)) {
+               if (clf->backend != NULL && strcmp (clf->backend, REDIS_BACKEND_TYPE)) {
+
+                       curst = clf->statfiles;
+                       while (curst) {
+                               stf = curst->data;
+
+                               /*
+                                * By default, all statfiles are treated as mmaped files
+                                */
+
                                /*
                                 * Check configuration sanity
                                 */
@@ -355,16 +357,16 @@ rspamd_redis_init (struct rspamd_stat_ctx *ctx, struct rspamd_config *cfg)
                                        if (rspamd_redis_expand_object (backend->redis_object, stf,
                                                        NULL, NULL) == 0) {
                                                msg_err ("statfile %s cannot write servers configuration",
-                                                       stf->symbol);
+                                                               stf->symbol);
                                        }
                                }
 
                                g_hash_table_insert (new->redis_elts, stf, backend);
 
                                ctx->statfiles ++;
-                       }
 
-                       curst = curst->next;
+                               curst = curst->next;
+                       }
                }
 
                cur = g_list_next (cur);
index af84faef0411802f93bda4ea54241bef53ffb1b8..ca88a3477841e24a34f1ea2523755761d83dee43 100644 (file)
@@ -359,12 +359,11 @@ rspamd_sqlite3_init (struct rspamd_stat_ctx *ctx,
 
        while (cur) {
                clf = cur->data;
+               if (clf->backend && strcmp (clf->backend, SQLITE3_BACKEND_TYPE) == 0) {
+                       curst = clf->statfiles;
 
-               curst = clf->statfiles;
-               while (curst) {
-                       stf = curst->data;
-
-                       if (stf->backend && strcmp (stf->backend, SQLITE3_BACKEND_TYPE) == 0) {
+                       while (curst) {
+                               stf = curst->data;
                                /*
                                 * Check configuration sanity
                                 */
@@ -394,9 +393,9 @@ rspamd_sqlite3_init (struct rspamd_stat_ctx *ctx,
                                }
 
                                ctx->statfiles ++;
-                       }
 
-                       curst = curst->next;
+                               curst = curst->next;
+                       }
                }
 
                cur = g_list_next (cur);
@@ -690,3 +689,11 @@ rspamd_sqlite3_get_stat (gpointer runtime,
 {
        return NULL;
 }
+
+gpointer
+rspamd_sqlite3_load_tokenizer_config (gpointer runtime,
+               gsize *len)
+{
+       /* TODO: unbreak */
+       return NULL;
+}