diff options
| author | Zandra <[email protected]> | 2015-11-26 12:21:26 +0100 |
|---|---|---|
| committer | Zandra <[email protected]> | 2015-11-26 12:21:26 +0100 |
| commit | 580d1bccabf9d005ce9d1bd1f8095bbb8130d899 (patch) | |
| tree | 15b1c113551a3e9d0d93da5aa30d58964231f1e7 /lib | |
| parent | 9baa87406fe7a9b914ec50eb90ff6808db9734a9 (diff) | |
| parent | 902ed3fe77d674fdbed3ee60ee613861ce2f1943 (diff) | |
| download | otp-580d1bccabf9d005ce9d1bd1f8095bbb8130d899.tar.gz otp-580d1bccabf9d005ce9d1bd1f8095bbb8130d899.tar.bz2 otp-580d1bccabf9d005ce9d1bd1f8095bbb8130d899.zip | |
Merge branch 'legoscia/ssl-dist-error-handling' into maint
* legoscia/ssl-dist-error-handling:
In ssl_tls_dist_proxy, pass along EPMD registration errors
OTP-13142
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; |