]> source.dussan.org Git - rspamd.git/commitdiff
Slightly improve logging in fuzzy.
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Tue, 24 Nov 2015 16:38:32 +0000 (16:38 +0000)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Tue, 24 Nov 2015 16:38:32 +0000 (16:38 +0000)
src/libserver/fuzzy_backend.c

index e582de3bfb09c5ea8476ee35a0a93d16b70cd0d2..e90fb314688f0db3249b93c136849f7efc3ff91d 100644 (file)
@@ -290,7 +290,8 @@ rspamd_fuzzy_backend_run_stmt (struct rspamd_fuzzy_backend *backend,
                stmt = prepared_stmts[idx].stmt;
        }
 
-       msg_debug_fuzzy_backend ("executing `%s`", prepared_stmts[idx].sql);
+       msg_debug_fuzzy_backend ("executing `%s` %s auto cleanup",
+                       prepared_stmts[idx].sql, auto_cleanup ? "with" : "without");
        argtypes = prepared_stmts[idx].args;
        sqlite3_clear_bindings (stmt);
        sqlite3_reset (stmt);
@@ -324,8 +325,9 @@ retry:
        if (retcode == prepared_stmts[idx].result) {
                return SQLITE_OK;
        }
-       else if (retcode != SQLITE_DONE) {
-               if (retcode == SQLITE_BUSY && retries++ < max_retries) {
+       else {
+               if ((retcode == SQLITE_BUSY ||
+                               retcode == SQLITE_LOCKED) && retries++ < max_retries) {
                        double_to_ts (sql_sleep_time, &ts);
                        nanosleep (&ts, NULL);
                        goto retry;