diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2015-10-27 06:13:57 +0900 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2015-10-27 06:13:57 +0900 |
| commit | 161e256c2f5a3bb278957f6c1e0f43cf869ba5fa (patch) | |
| tree | e1fb7841d65141c35f4fdda05e4a1d4bfac5be4a /src | |
| parent | 8366d05cc8638662a5bf74448e63f34f74220e10 (diff) | |
| parent | 50f68262c789997073f95764242b2e75d8f51e83 (diff) | |
| download | rabbitmq-server-git-161e256c2f5a3bb278957f6c1e0f43cf869ba5fa.tar.gz | |
Merge branch 'stable'
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_prelaunch.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rabbit_prelaunch.erl b/src/rabbit_prelaunch.erl index c8200d472d..29e62ae2ec 100644 --- a/src/rabbit_prelaunch.erl +++ b/src/rabbit_prelaunch.erl @@ -113,17 +113,17 @@ dist_port_use_check(NodeHost) -> case os:getenv("RABBITMQ_DIST_PORT") of false -> ok; PortStr -> Port = list_to_integer(PortStr), - disk_port_use_check_ipv4(NodeHost, Port) + dist_port_use_check_ipv4(NodeHost, Port) end. -disk_port_use_check_ipv4(NodeHost, Port) -> +dist_port_use_check_ipv4(NodeHost, Port) -> case gen_tcp:listen(Port, [inet, {reuseaddr, true}]) of {ok, Sock} -> gen_tcp:close(Sock); - {error, einval} -> disk_port_use_check_ipv6(NodeHost, Port); + {error, einval} -> dist_port_use_check_ipv6(NodeHost, Port); {error, _} -> dist_port_use_check_fail(Port, NodeHost) end. -disk_port_use_check_ipv6(NodeHost, Port) -> +dist_port_use_check_ipv6(NodeHost, Port) -> case gen_tcp:listen(Port, [inet6, {reuseaddr, true}]) of {ok, Sock} -> gen_tcp:close(Sock); {error, _} -> dist_port_use_check_fail(Port, NodeHost) |