From 04d6da8353b748842c99ae8430e62693aeb0957e Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Sat, 10 Jun 2017 12:39:55 +0100 Subject: [PATCH] [Minor] Minor fixes to log messages --- src/lua/lua_http.c | 4 ++-- src/plugins/lua/url_redirector.lua | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lua/lua_http.c b/src/lua/lua_http.c index dd208f6d3..cda331129 100644 --- a/src/lua/lua_http.c +++ b/src/lua/lua_http.c @@ -135,8 +135,8 @@ static void lua_http_maybe_free (struct lua_http_cbdata *cbd) { if (cbd->session) { - rspamd_session_watcher_pop (cbd->session, cbd->w); rspamd_session_remove_event (cbd->session, lua_http_fin, cbd); + rspamd_session_watcher_pop (cbd->session, cbd->w); } else { lua_http_fin (cbd); @@ -616,7 +616,7 @@ lua_http_request (lua_State *L) cbd, g_quark_from_static_string ("lua http")); cbd->w = rspamd_session_get_watcher (session); - rspamd_session_watcher_push (session); + rspamd_session_watcher_push_specific (session, cbd->w); } if (rspamd_parse_inet_address (&cbd->addr, msg->host->str, msg->host->len)) { diff --git a/src/plugins/lua/url_redirector.lua b/src/plugins/lua/url_redirector.lua index 22603f288..698ed6f8c 100644 --- a/src/plugins/lua/url_redirector.lua +++ b/src/plugins/lua/url_redirector.lua @@ -139,8 +139,8 @@ local function resolve_cached(task, orig_url, url, key, param, ntries) cache_url(task, orig_url, url, key, param) elseif code == 301 or code == 302 then local loc = headers['Location'] - rspamd_logger.infox(task, 'found redirect from %s to %s, err code 200', - orig_url, loc) + rspamd_logger.infox(task, 'found redirect from %s to %s, err code %s', + orig_url, loc, code) if loc then if settings.redirectors_only then if rspamd_plugins.surbl.is_redirector(task, loc) then -- 2.39.5