aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2009-08-03 15:03:50 +0000
committerBadlop <badlop@process-one.net>2009-08-03 15:03:50 +0000
commit720fd7605d768458047ad6768b7cb1631858d370 (patch)
tree4face13403ae0e285d48d259520901e23f5f6edd /src
parentfix is_last_item_cache_enabled issue with PEP, and fix indentation (diff)
Document the new option s2s_dns_options, expressed in seconds (EJAB-994)
SVN Revision: 2417
Diffstat (limited to 'src')
-rw-r--r--src/ejabberd_s2s_out.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl
index 4bd92dc09..0366ec30e 100644
--- a/src/ejabberd_s2s_out.erl
+++ b/src/ejabberd_s2s_out.erl
@@ -1037,9 +1037,9 @@ srv_lookup(Server) ->
L when is_list(L) -> L;
_ -> []
end,
- Timeout = proplists:get_value(timeout, Options, timer:seconds(10)),
+ TimeoutMs = timer:seconds(proplists:get_value(timeout, Options, 10)),
Retries = proplists:get_value(retries, Options, 2),
- srv_lookup(Server, Timeout, Retries).
+ srv_lookup(Server, TimeoutMs, Retries).
%% XXX - this behaviour is suboptimal in the case that the domain
%% has a "_xmpp-server._tcp." but not a "_jabber._tcp." record and