]> git.ipfire.org Git - thirdparty/rspamd.git/commitdiff
[Minor] Slightly increase write timeout
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Thu, 28 Jan 2021 14:38:51 +0000 (14:38 +0000)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Thu, 28 Jan 2021 14:38:51 +0000 (14:38 +0000)
src/libserver/task.c
src/rspamd_proxy.c
src/worker.c

index 0969338038d9d3ce3218ef3b516365945b7e6237..43ce59ee10802ef3a66c814dbf5de24c917aa490 100644 (file)
@@ -125,7 +125,7 @@ rspamd_task_new (struct rspamd_worker *worker,
 static void
 rspamd_task_reply (struct rspamd_task *task)
 {
-       const ev_tstamp write_timeout = 2.0;
+       const ev_tstamp write_timeout = 5.0;
 
        if (task->fin_callback) {
                task->fin_callback (task, task->fin_arg);
index 3fa5da390c7318a578e68803b202a9f87b6968c2..f5bc5f68e2519e44a8275d1f0dfe5f01e695d486 100644 (file)
@@ -1737,7 +1737,7 @@ rspamd_proxy_scan_self_reply (struct rspamd_task *task)
                                NULL,
                                ctype,
                                session,
-                               0);
+                               session->ctx->timeout / 10.0);
        }
 }
 
index 1a3b118c80957a09e06ecdbc92da2dc0d265b5db..5262f7cde3761373df9fe087b9daec44bd91853a 100644 (file)
@@ -271,12 +271,13 @@ rspamd_worker_error_handler (struct rspamd_http_connection *conn, GError *err)
                        rspamd_printf_fstring (&reply, "{\"error\":\"%V\"}", msg->status);
                        rspamd_http_message_set_body_from_fstring_steal (msg, reply);
                        rspamd_http_connection_reset (task->http_conn);
+                       /* Use a shorter timeout for writing reply */
                        rspamd_http_connection_write_message (task->http_conn,
                                        msg,
                                        NULL,
                                        "application/json",
                                        task,
-                                       1.0);
+                                       session->ctx->timeout / 10.0);
                }
        }
        else {