diff options
| author | Alexey Lebedeff <[email protected]> | 2016-04-22 17:33:34 +0300 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2016-11-15 15:46:54 +0200 |
| commit | f33ff7cbacb204adae9d53ad15829f44c4140525 (patch) | |
| tree | eb4b031b5e887e4fdc2391cecb3acb6511de735c /src | |
| parent | dff4ea04dc0e286e8cb43fea0177d3efc249aec5 (diff) | |
| download | ranch-f33ff7cbacb204adae9d53ad15829f44c4140525.tar.gz ranch-f33ff7cbacb204adae9d53ad15829f44c4140525.tar.bz2 ranch-f33ff7cbacb204adae9d53ad15829f44c4140525.zip | |
Improve error reporting
Simplify some return values, improve error messages for
eaddrinuse and no_cert.
Amended to add tests and simpler code. Also hides the
contents of cert and key transport options, if any.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ranch.erl | 13 | ||||
| -rw-r--r-- | src/ranch_acceptors_sup.erl | 13 | ||||
| -rw-r--r-- | src/ranch_ssl.erl | 15 |
3 files changed, 33 insertions, 8 deletions
diff --git a/src/ranch.erl b/src/ranch.erl index 7f751cf..9eb9a47 100644 --- a/src/ranch.erl +++ b/src/ranch.erl @@ -74,9 +74,20 @@ start_listener(Ref, NumAcceptors, Transport, TransOpts, Protocol, ProtoOpts) _ -> ok end, - Res + maybe_started(Res) end. +maybe_started({error, {{shutdown, + {failed_to_start_child, ranch_acceptors_sup, + {listen_error, _, Reason}}}, _}} = Error) -> + start_error(Reason, Error); +maybe_started(Res) -> + Res. + +start_error(E=eaddrinuse, _) -> {error, E}; +start_error(E=no_cert, _) -> {error, E}; +start_error(_, Error) -> Error. + -spec stop_listener(ref()) -> ok | {error, not_found}. stop_listener(Ref) -> case supervisor:terminate_child(ranch_sup, {ranch_listener_sup, Ref}) of diff --git a/src/ranch_acceptors_sup.erl b/src/ranch_acceptors_sup.erl index 67854d5..d716a33 100644 --- a/src/ranch_acceptors_sup.erl +++ b/src/ranch_acceptors_sup.erl @@ -49,8 +49,15 @@ init([Ref, NumAcceptors, Transport, TransOpts]) -> {ok, {{one_for_one, 1, 5}, Procs}}. -spec listen_error(any(), module(), any(), atom()) -> no_return(). -listen_error(Ref, Transport, TransOpts2, Reason) -> +listen_error(Ref, Transport, TransOpts0, Reason) -> + TransOpts1 = lists:keyreplace(cert, 1, TransOpts0, {cert, '...'}), + TransOpts = lists:keyreplace(key, 1, TransOpts1, {key, '...'}), error_logger:error_msg( - "Failed to start Ranch listener ~p in ~p:listen(~p) for reason ~p (~s)~n", - [Ref, Transport, TransOpts2, Reason, inet:format_error(Reason)]), + "Failed to start Ranch listener ~p in ~p:listen(~999999p) for reason ~p (~s)~n", + [Ref, Transport, TransOpts, Reason, format_error(Reason)]), exit({listen_error, Ref, Reason}). + +format_error(no_cert) -> + "no certificate provided; see cert, certfile, sni_fun or sni_hosts options"; +format_error(Reason) -> + inet:format_error(Reason). diff --git a/src/ranch_ssl.erl b/src/ranch_ssl.erl index b3fab51..0385065 100644 --- a/src/ranch_ssl.erl +++ b/src/ranch_ssl.erl @@ -89,10 +89,17 @@ messages() -> {ssl, ssl_closed, ssl_error}. -spec listen(opts()) -> {ok, ssl:sslsocket()} | {error, atom()}. listen(Opts) -> - true = lists:keymember(cert, 1, Opts) - orelse lists:keymember(certfile, 1, Opts) - orelse lists:keymember(sni_fun, 1, Opts) - orelse lists:keymember(sni_hosts, 1, Opts), + case lists:keymember(cert, 1, Opts) + orelse lists:keymember(certfile, 1, Opts) + orelse lists:keymember(sni_fun, 1, Opts) + orelse lists:keymember(sni_hosts, 1, Opts) of + true -> + do_listen(Opts); + false -> + {error, no_cert} + end. + +do_listen(Opts) -> Opts2 = ranch:set_option_default(Opts, backlog, 1024), Opts3 = ranch:set_option_default(Opts2, ciphers, unbroken_cipher_suites()), Opts4 = ranch:set_option_default(Opts3, nodelay, true), |