From 3713488b271aee3c381048843c82d57d328df346 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Thu, 10 May 2012 23:05:03 +0200 Subject: s2smanager, mod_s2s: Move checking DNS timeout option to mod_s2s --- core/s2smanager.lua | 5 ----- plugins/mod_s2s/s2sout.lib.lua | 2 ++ 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/core/s2smanager.lua b/core/s2smanager.lua index a4b75db5..ea626baa 100644 --- a/core/s2smanager.lua +++ b/core/s2smanager.lua @@ -17,12 +17,7 @@ local logger_init = require "util.logger".init; local log = logger_init("s2smanager"); -local adns, dns = require "net.adns", require "net.dns"; local config = require "core.configmanager"; -local dns_timeout = config.get("*", "core", "dns_timeout") or 15; - ---FIXME: s2sout should create its own resolver w/ timeout -dns.settimeout(dns_timeout); local prosody = _G.prosody; incoming_s2s = {}; diff --git a/plugins/mod_s2s/s2sout.lib.lua b/plugins/mod_s2s/s2sout.lib.lua index f3496597..2ddc9299 100644 --- a/plugins/mod_s2s/s2sout.lib.lua +++ b/plugins/mod_s2s/s2sout.lib.lua @@ -26,6 +26,8 @@ local log = module._log; local sources = {}; +local dns_timeout = module:get_option_number("dns_timeout", 15); +dns.settimeout(dns_timeout); local max_dns_depth = module:get_option_number("dns_max_depth", 3); local s2sout = {}; -- cgit v1.2.3