[Fix] Use proper syntax for making DNS requests

diff --git a/src/libserver/events.c b/src/libserver/events.c
index c938945d2c39e7518da4824bc86c0a6fa90de4bb..db17f87d66e160c0e5c0c00e367ba101a67de0b7 100644 (file)
--- a/src/libserver/events.c
+++ b/src/libserver/events.c
@@ -172,7 +172,7 @@ rspamd_session_add_event (struct rspamd_async_session *session,
        new_event->user_data = user_data;
        new_event->subsystem = subsystem;
 
-       msg_debug_session ("added event: %p, pending %d events, "
+       msg_debug_session ("added event: %p, pending %d (+1) events, "
                                           "subsystem: %s",
                        user_data,
                        kh_size (session->events),
@@ -222,6 +222,11 @@ rspamd_session_remove_event (struct rspamd_async_session *session,
        }
 
        found_ev = kh_key (session->events, k);
+       msg_debug_session ("removed event: %p, pending %d (-1) events, "
+                                          "subsystem: %s",
+                       ud,
+                       kh_size (session->events),
+                       g_quark_to_string (found_ev->subsystem));
        kh_del (rspamd_events_hash, session->events, k);
 
        /* Remove event */

diff --git a/src/plugins/lua/asn.lua b/src/plugins/lua/asn.lua
index 86f1c42d22db17b7b799499b2c7f3482e390df2f..2e5b8466eac8b9ca13db5362ff42dfee1134d3fb 100644 (file)
--- a/src/plugins/lua/asn.lua
+++ b/src/plugins/lua/asn.lua
@@ -74,8 +74,9 @@ local function asn_check(task)
       asn_set(parts[1], parts[2], parts[3])
     end
 
-    task:get_resolver():resolve_txt(task:get_session(), task:get_mempool(),
-        req_name, rspamd_dns_cb)
+    task:get_resolver():resolve_txt({task = task,
+                                     name = req_name,
+                                     callback = rspamd_dns_cb})
   end
 
   local ip = task:get_from_ip()

diff --git a/test/functional/lua/prepostfilters.lua b/test/functional/lua/prepostfilters.lua
index 4f14d02223a913402c602edb706213d8aa0eb755..c87c958490f92cf54bf5b80ba905222c8bc52e7c 100644 (file)
--- a/test/functional/lua/prepostfilters.lua
+++ b/test/functional/lua/prepostfilters.lua
@@ -16,7 +16,7 @@ for i = 1,10 do
       end
       if task:has_symbol('TEST_PRE') then
         local r = task:get_resolver()
-        r:resolve_a(task:get_session(), task:get_mempool(), 'example.com', dns_cb)
+        r:resolve_a({task = task, name = 'example.com', callback = dns_cb})
       end
     end
   })