diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2018-07-02 12:30:08 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2018-07-02 12:30:08 +0100 |
| commit | 1812d38cb85eb3766e1ed0adbf75b57475af6b0e (patch) | |
| tree | 4cb04b19f6bb7469b3269b2a5ef44df4d6bb95b6 /src/plugins | |
| parent | e03e1d6bfbd976ec23af197d0d88ccff1933e430 (diff) | |
| download | rspamd-1812d38cb85eb3766e1ed0adbf75b57475af6b0e.tar.gz rspamd-1812d38cb85eb3766e1ed0adbf75b57475af6b0e.zip | |
[Feature] Distinguish IP failures from connection failures
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/fuzzy_check.c | 14 | ||||
| -rw-r--r-- | src/plugins/surbl.c | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/fuzzy_check.c b/src/plugins/fuzzy_check.c index 777f6fa62..766d11e5f 100644 --- a/src/plugins/fuzzy_check.c +++ b/src/plugins/fuzzy_check.c @@ -2168,7 +2168,7 @@ fuzzy_check_io_callback (gint fd, short what, void *arg) session->state == 1 ? "read" : "write", errno, strerror (errno)); - rspamd_upstream_fail (session->server); + rspamd_upstream_fail (session->server, FALSE); rspamd_session_remove_event (session->task->s, fuzzy_io_fin, session); } else { @@ -2207,7 +2207,7 @@ fuzzy_check_timer_callback (gint fd, short what, void *arg) rspamd_upstream_name (session->server), rspamd_inet_address_to_string_pretty (session->addr), session->retransmits); - rspamd_upstream_fail (session->server); + rspamd_upstream_fail (session->server, FALSE); rspamd_session_remove_event (session->task->s, fuzzy_io_fin, session); } else { @@ -2412,7 +2412,7 @@ fuzzy_controller_io_callback (gint fd, short what, void *arg) rspamd_upstream_name (session->server), rspamd_inet_address_to_string_pretty (session->addr), errno, strerror (errno)); - rspamd_upstream_fail (session->server); + rspamd_upstream_fail (session->server, FALSE); } /* @@ -2509,7 +2509,7 @@ fuzzy_controller_timer_callback (gint fd, short what, void *arg) task = session->task; if (session->retransmits >= fuzzy_module_ctx->retransmits) { - rspamd_upstream_fail (session->server); + rspamd_upstream_fail (session->server, FALSE); msg_err_task_check ("got IO timeout with server %s(%s), " "after %d retransmits", rspamd_upstream_name (session->server), @@ -2831,7 +2831,7 @@ register_fuzzy_client_call (struct rspamd_task *task, rspamd_inet_address_to_string_pretty (addr), errno, strerror (errno)); - rspamd_upstream_fail (selected); + rspamd_upstream_fail (selected, FALSE); g_ptr_array_free (commands, TRUE); } else { @@ -2942,7 +2942,7 @@ register_fuzzy_controller_call (struct rspamd_http_connection_entry *entry, if ((sock = rspamd_inet_address_connect (addr, SOCK_DGRAM, TRUE)) == -1) { - rspamd_upstream_fail (selected); + rspamd_upstream_fail (selected, TRUE); } else { s = @@ -3302,7 +3302,7 @@ fuzzy_check_send_lua_learn (struct fuzzy_rule *rule, if ((sock = rspamd_inet_address_connect (addr, SOCK_DGRAM, TRUE)) == -1) { - rspamd_upstream_fail (selected); + rspamd_upstream_fail (selected, TRUE); } else { s = diff --git a/src/plugins/surbl.c b/src/plugins/surbl.c index 64b1b14f6..bfb6f4e82 100644 --- a/src/plugins/surbl.c +++ b/src/plugins/surbl.c @@ -1539,7 +1539,7 @@ surbl_redirector_error (struct rspamd_http_connection *conn, msg_err_surbl ("connection with http server %s terminated incorrectly: %e", rspamd_inet_address_to_string (rspamd_upstream_addr (param->redirector)), err); - rspamd_upstream_fail (param->redirector); + rspamd_upstream_fail (param->redirector, FALSE); rspamd_session_remove_event (param->task->s, free_redirector_session, param); } |