Document the new option s2s_dns_options, expressed in seconds (EJAB-994)

SVN Revision: 2417

diff --git a/doc/guide.html b/doc/guide.html
index b72ca38f7dccaa95f46c38f21d4bafbf31a8d0c8..4bfe5e61c4dbb1e20a05e2337b7ab817f441f5a3 100644 (file)
--- a/doc/guide.html
+++ b/doc/guide.html
@@ -792,6 +792,10 @@ Full path to the file containing the SSL certificate for a specific domain.
 Specify which address families to try, in what order, and connect timeout in milliseconds.
 By default it first tries connecting with IPv4, if that fails it tries using IPv6,
 with a timeout of 10000 milliseconds.
+</DD><DT CLASS="dt-description"><B><TT>{s2s_dns_options, [{Property, Value}]}</TT></B></DT><DD CLASS="dd-description">
+Define properties to use for DNS resolving.
+Allowed Properties are: <TT>timeout</TT> in seconds which default value is <TT>10</TT>
+and <TT>retries</TT> which default value is <TT>2</TT>.
 </DD><DT CLASS="dt-description"><B><TT>{s2s_default_policy, allow|deny}</TT></B></DT><DD CLASS="dd-description">
 The default policy for incoming and outgoing s2s connections to other Jabber servers.
 The default value is <TT>allow</TT>.

diff --git a/doc/guide.tex b/doc/guide.tex
index 957a85286336b7394ebdd8b3dde94283112e60a9..4141d23ea83a24ffbf3469baad37822f2cfc87bc 100644 (file)
--- a/doc/guide.tex
+++ b/doc/guide.tex
@@ -931,6 +931,10 @@ There are some additional global options that can be specified in the ejabberd c
   Specify which address families to try, in what order, and connect timeout in milliseconds.
   By default it first tries connecting with IPv4, if that fails it tries using IPv6,
   with a timeout of 10000 milliseconds.
+  \titem{\{s2s\_dns\_options, [\{Property, Value\}]\}}
+  \ind{options!s2s\_dns\_options}Define properties to use for DNS resolving.
+  Allowed Properties are: \term{timeout} in seconds which default value is \term{10}
+  and \term{retries} which default value is \term{2}.
   \titem{\{s2s\_default\_policy, allow|deny\}}
   The default policy for incoming and outgoing s2s connections to other Jabber servers.
   The default value is \term{allow}.

diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl
index 4bd92dc095c62ca1af92c77fcdd5dc872e54a4b0..0366ec30e89cf8b0fc70d1197dcea34c58087577 100644 (file)
--- 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