summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2014-03-12 14:18:30 +0000
committerSimon MacMullen <simon@rabbitmq.com>2014-03-12 14:18:30 +0000
commitddaf3e5c1353b80f7a25673eb7b7fc726239ddcb (patch)
tree70f7f1f75adafeb8f1f33a19d6125789d75bb731
parentd80d4bfd791f9aeb80d4d876b7b9fbb29d85ed60 (diff)
downloadrabbitmq-server-git-ddaf3e5c1353b80f7a25673eb7b7fc726239ddcb.tar.gz
That should probably be a define, right?
-rw-r--r--src/rabbit_nodes.erl4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/rabbit_nodes.erl b/src/rabbit_nodes.erl
index c66d42dafd..dfec8ec579 100644
--- a/src/rabbit_nodes.erl
+++ b/src/rabbit_nodes.erl
@@ -23,6 +23,7 @@
-include_lib("kernel/include/inet.hrl").
-define(EPMD_TIMEOUT, 30000).
+-define(TCP_DIAGNOSTIC_TIMEOUT, 5000).
%%----------------------------------------------------------------------------
%% Specs
@@ -113,7 +114,8 @@ diagnostics_node0(Name, Host, NamePorts) ->
diagnose_connect(Host, Port) ->
case inet:gethostbyname(Host) of
{ok, #hostent{h_addrtype = Family}} ->
- case gen_tcp:connect(Host, Port, [Family], 5000) of
+ case gen_tcp:connect(Host, Port, [Family],
+ ?TCP_DIAGNOSTIC_TIMEOUT) of
{ok, Socket} -> gen_tcp:close(Socket),
ok;
{error, _} = E -> E