diff options
| author | Zandra <[email protected]> | 2015-11-26 12:21:50 +0100 |
|---|---|---|
| committer | Zandra <[email protected]> | 2015-11-26 12:21:50 +0100 |
| commit | ef3156ad794c0cdc5332e2941fc7d4c7bf638115 (patch) | |
| tree | 0e53d0460a8f50702e76520a881d37acaad08cdd /lib | |
| parent | d056f1953a406f0e86c2c26489d33264f3a63570 (diff) | |
| parent | 580d1bccabf9d005ce9d1bd1f8095bbb8130d899 (diff) | |
| download | otp-ef3156ad794c0cdc5332e2941fc7d4c7bf638115.tar.gz otp-ef3156ad794c0cdc5332e2941fc7d4c7bf638115.tar.bz2 otp-ef3156ad794c0cdc5332e2941fc7d4c7bf638115.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/src/ssl_tls_dist_proxy.erl | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/ssl/src/ssl_tls_dist_proxy.erl b/lib/ssl/src/ssl_tls_dist_proxy.erl index 273d3b5521..ce742948b7 100644 --- a/lib/ssl/src/ssl_tls_dist_proxy.erl +++ b/lib/ssl/src/ssl_tls_dist_proxy.erl @@ -66,9 +66,13 @@ handle_call({listen, Name}, _From, State) -> {ok, TcpAddress} = get_tcp_address(Socket), {ok, WorldTcpAddress} = get_tcp_address(World), {_,Port} = WorldTcpAddress#net_address.address, - {ok, Creation} = erl_epmd:register_node(Name, Port), - {reply, {ok, {Socket, TcpAddress, Creation}}, - State#state{listen={Socket, World}}}; + case erl_epmd:register_node(Name, Port) of + {ok, Creation} -> + {reply, {ok, {Socket, TcpAddress, Creation}}, + State#state{listen={Socket, World}}}; + {error, _} = Error -> + {reply, Error, State} + end; Error -> {reply, Error, State} end; |