[Minor] Minor fixes to log messages

diff --git a/src/lua/lua_http.c b/src/lua/lua_http.c
index dd208f6d34754a5ec3dc7e15c58be0de2c6704fa..cda33112939c1f42c017da01dfb60337caeec455 100644 (file)
--- 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 22603f288e19f43c3175994597efa18f3c05469f..698ed6f8c411340c0d453305159840b3b6a0d7de 100644 (file)
--- 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