From: Vsevolod Stakhov Date: Thu, 3 Nov 2016 17:48:44 +0000 (+0000) Subject: [Minor] Init resolver in log helper X-Git-Tag: 1.4.0~127 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b096690fbadc95e7d0c7a48d422cdbd0268e2c62;p=thirdparty%2Frspamd.git [Minor] Init resolver in log helper --- diff --git a/src/log_helper.c b/src/log_helper.c index 29cb511a3e..467f98f310 100644 --- a/src/log_helper.c +++ b/src/log_helper.c @@ -52,6 +52,7 @@ struct log_helper_ctx { struct event_base *ev_base; struct event log_ev; struct rspamd_worker_lua_script *scripts; + struct rspamd_dns_resolver *resolver; lua_State *L; gint pair[2]; }; @@ -189,6 +190,11 @@ start_log_helper (struct rspamd_worker *worker) ctx->cfg = worker->srv->cfg; ctx->scripts = worker->cf->scripts; ctx->L = ctx->cfg->lua_state; + ctx->resolver = dns_resolver_init (worker->srv->logger, + ctx->ev_base, + worker->srv->cfg); + rspamd_upstreams_library_config (worker->srv->cfg, ctx->cfg->ups_ctx, + ctx->ev_base, ctx->resolver->r); DL_COUNT (worker->cf->scripts, tmp, nscripts); msg_info ("started log_helper worker with %d scripts", nscripts); diff --git a/src/plugins/lua/fann_scores.lua b/src/plugins/lua/fann_scores.lua index 64566e1029..0a238db291 100644 --- a/src/plugins/lua/fann_scores.lua +++ b/src/plugins/lua/fann_scores.lua @@ -469,7 +469,6 @@ local function fann_train_callback(score, required_score, results, cf, id, opts, if learn_spam then k = 'spam' else k = 'ham' end local function can_train_cb(err, data) - rspamd_logger.errx('hui') if not err and tonumber(data) > 0 then local learn_data = symbols_to_fann_vector( map(function(r) return r[1] end, results), @@ -494,7 +493,6 @@ local function fann_train_callback(score, required_score, results, cf, id, opts, end end - rspamd_logger.errx('pizda: %s %s %s %s', redis_can_train_sha, fname, tostring(max_trains), k) redis_make_request(ev_base, rspamd_config, nil,