diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2012-01-23 08:49:06 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2012-01-23 08:49:06 +0000 |
| commit | 501520eafe6b9f5482fa7ad46d64b9d90e218979 (patch) | |
| tree | 35ff8bc20191b7f575a0be796165c292d3705545 | |
| parent | 74cf43b52b944f62239c491d2b2ae0ddc305828a (diff) | |
| download | rabbitmq-server-501520eafe6b9f5482fa7ad46d64b9d90e218979.tar.gz | |
refactor: turn a condition into a guard
| -rw-r--r-- | src/rabbit_networking.erl | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl index 0f984176..db5e4d3c 100644 --- a/src/rabbit_networking.erl +++ b/src/rabbit_networking.erl @@ -170,24 +170,20 @@ ssl_transform_fun(SslOpts) -> check_tcp_listener_address(NamePrefix, Port) when is_integer(Port) -> check_tcp_listener_address_auto(NamePrefix, Port); - check_tcp_listener_address(NamePrefix, {"auto", Port}) -> %% Variant to prevent lots of hacking around in bash and batch files check_tcp_listener_address_auto(NamePrefix, Port); - check_tcp_listener_address(NamePrefix, {Host, Port}) -> %% auto: determine family IPv4 / IPv6 after converting to IP address check_tcp_listener_address(NamePrefix, {Host, Port, auto}); - -check_tcp_listener_address(NamePrefix, {Host, Port, Family0}) -> - if is_integer(Port) andalso (Port >= 0) andalso (Port =< 65535) -> ok; - true -> error_logger:error_msg("invalid port ~p - not 0..65535~n", - [Port]), - throw({error, {invalid_port, Port}}) - end, +check_tcp_listener_address(NamePrefix, {Host, Port, Family0}) + when is_integer(Port) andalso (Port >= 0) andalso (Port =< 65535) -> [{IPAddress, Port, Family, rabbit_misc:tcp_name(NamePrefix, IPAddress, Port)} || - {IPAddress, Family} <- getaddr(Host, Family0)]. + {IPAddress, Family} <- getaddr(Host, Family0)]; +check_tcp_listener_address(_, {_Host, Port, _Family0}) -> + error_logger:error_msg("invalid port ~p - not 0..65535~n", [Port]), + throw({error, {invalid_port, Port}}). check_tcp_listener_address_auto(NamePrefix, Port) -> lists:append([check_tcp_listener_address(NamePrefix, Listener) || |