Adopt DNS logging.

diff --git a/src/controller.c b/src/controller.c
index 269ca6db2fdeee84b6b3daec1a7d7842c145ddf9..92dd87d91725c1e45e3b88f6823a008097a5427e 100644 (file)
--- a/src/controller.c
+++ b/src/controller.c
@@ -1986,7 +1986,7 @@ start_controller (struct rspamd_worker *worker)
        rspamd_snprintf (greetingbuf, sizeof (greetingbuf), "Rspamd version %s is running on %s" CRLF, RVERSION, hostbuf);
 
        start_map_watch (worker->srv->cfg, ctx->ev_base);
-       ctx->resolver = dns_resolver_init (ctx->ev_base, worker->srv->cfg);
+       ctx->resolver = dns_resolver_init (worker->srv->logger, ctx->ev_base, worker->srv->cfg);
 
        event_base_loop (ctx->ev_base, 0);
 

diff --git a/src/dns.c b/src/dns.c
index 5b2f928b2a4bd612dc4ba8d71089169f7d5219b5..3a62cfede3f259d87b671b15584821bcffbd4b01 100644 (file)
--- a/src/dns.c
+++ b/src/dns.c
@@ -94,7 +94,7 @@ make_dns_request (struct rspamd_dns_resolver *resolver,
 
 
 struct rspamd_dns_resolver *
-dns_resolver_init (struct event_base *ev_base, struct config_file *cfg)
+dns_resolver_init (rspamd_logger_t *logger, struct event_base *ev_base, struct config_file *cfg)
 {
        GList                          *cur;
        struct rspamd_dns_resolver     *new;
@@ -109,6 +109,7 @@ dns_resolver_init (struct event_base *ev_base, struct config_file *cfg)
        new->r = rdns_resolver_new ();
        rdns_bind_libevent (new->r, new->ev_base);
        rdns_resolver_set_log_level (new->r, cfg->log_level);
+       rdns_resolver_set_logger (new->r, (rdns_log_function)rspamd_common_logv, logger);
 
        if (cfg->nameservers == NULL) {
                /* Parse resolv.conf */

diff --git a/src/dns.h b/src/dns.h
index e39fb987634026303d00b373a913b0c8340a7bf5..822483de1740b0abc50fa570f194665cc605f955 100644 (file)
--- a/src/dns.h
+++ b/src/dns.h
@@ -29,6 +29,7 @@
 #include "config.h"
 #include "mem_pool.h"
 #include "events.h"
+#include "logger.h"
 #include "rdns.h"
 
 struct rspamd_dns_resolver;
@@ -38,7 +39,8 @@ struct rspamd_dns_resolver;
 /**
  * Init DNS resolver, params are obtained from a config file or system file /etc/resolv.conf
  */
-struct rspamd_dns_resolver *dns_resolver_init (struct event_base *ev_base, struct config_file *cfg);
+struct rspamd_dns_resolver *dns_resolver_init (rspamd_logger_t *logger,
+               struct event_base *ev_base, struct config_file *cfg);
 
 /**
  * Make a DNS request

diff --git a/src/lua/lua_dns.c b/src/lua/lua_dns.c
index c53688ef5a8afec707866602301dbb9eb1de96b4..3f2b26389197170e7fa16c8de078f70f980be7f2 100644 (file)
--- a/src/lua/lua_dns.c
+++ b/src/lua/lua_dns.c
@@ -154,7 +154,7 @@ lua_dns_resolver_init (lua_State *L)
        cfg = pcfg ? *(pcfg) : NULL;
 
        if (base != NULL && cfg != NULL) {
-               resolver = dns_resolver_init (base, cfg);
+               resolver = dns_resolver_init (rspamd_main->logger, base, cfg);
                if (resolver) {
                        presolver = lua_newuserdata (L, sizeof (gpointer));
                        lua_setclass (L, "rspamd{resolver}", -1);

diff --git a/src/lua_worker.c b/src/lua_worker.c
index 8b04b8838a911d5ccd06d2c4064b847788deacf8..e9b06f50881ae0eb3167bb7f94b03860f5c696ec 100644 (file)
--- a/src/lua_worker.c
+++ b/src/lua_worker.c
@@ -454,7 +454,7 @@ start_lua_worker (struct rspamd_worker *worker)
        event_base_set (ctx->ev_base, &worker->sig_ev_usr1);
        signal_add (&worker->sig_ev_usr1, NULL);
 
-       ctx->resolver = dns_resolver_init (ctx->ev_base, worker->srv->cfg);
+       ctx->resolver = dns_resolver_init (worker->srv->logger, ctx->ev_base, worker->srv->cfg);
 
        /* Open worker's lib */
        luaopen_lua_worker (L);

diff --git a/src/rdns b/src/rdns
index cddc17d60ccf3516516e73f4e5cab151277fafbb..5ca36d831ef871fbc7b76846b554a875c1ef5a87 160000 (submodule)
--- a/src/rdns
+++ b/src/rdns
@@ -1 +1 @@
-Subproject commit cddc17d60ccf3516516e73f4e5cab151277fafbb
+Subproject commit 5ca36d831ef871fbc7b76846b554a875c1ef5a87

diff --git a/src/smtp_proxy.c b/src/smtp_proxy.c
index 24d78ef4f7ab461ca13bbbbc721e13ac519578ae..89f7e183664643f09172c3d4c2147989dbfde7dd 100644 (file)
--- a/src/smtp_proxy.c
+++ b/src/smtp_proxy.c
@@ -1063,7 +1063,7 @@ start_smtp_proxy (struct rspamd_worker *worker)
        signal_add (&worker->sig_ev_usr1, NULL);
 
        /* DNS resolver */
-       ctx->resolver = dns_resolver_init (ctx->ev_base, worker->srv->cfg);
+       ctx->resolver = dns_resolver_init (worker->srv->logger, ctx->ev_base, worker->srv->cfg);
 
        /* Set umask */
        umask (S_IWGRP | S_IWOTH | S_IROTH | S_IRGRP);

diff --git a/src/webui.c b/src/webui.c
index d02c499dc8ed4540448f1ba27a56215b16c504f3..b2495ef7cecfc9a01ecd8766b677450a3cd1ecd2 100644 (file)
--- a/src/webui.c
+++ b/src/webui.c
@@ -1730,7 +1730,7 @@ start_webui_worker (struct rspamd_worker *worker)
        rspamd_http_router_add_path (ctx->http, PATH_SCAN, rspamd_webui_handle_scan, ctx);
 #endif
 
-       ctx->resolver = dns_resolver_init (ctx->ev_base, worker->srv->cfg);
+       ctx->resolver = dns_resolver_init (worker->srv->logger, ctx->ev_base, worker->srv->cfg);
 
        /* Maps events */
        start_map_watch (worker->srv->cfg, ctx->ev_base);

diff --git a/src/worker.c b/src/worker.c
index f322fcf7b8bcfc74ed7c914312a48618b2c82e3f..cb5d6a140b1082303c7afd5481b0ae81050fd991 100644 (file)
--- a/src/worker.c
+++ b/src/worker.c
@@ -443,7 +443,7 @@ start_worker (struct rspamd_worker *worker)
        start_map_watch (worker->srv->cfg, ctx->ev_base);
 
 
-       ctx->resolver = dns_resolver_init (ctx->ev_base, worker->srv->cfg);
+       ctx->resolver = dns_resolver_init (worker->srv->logger, ctx->ev_base, worker->srv->cfg);
 
        /* Create classify pool */
        ctx->classify_pool = NULL;