diff options
author | Sverker Eriksson <sverker@erlang.org> | 2020-05-27 20:04:46 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-27 20:04:46 +0200 |
commit | 1d7e5a8b14ba5a269402a1e2186f5c279cd0b2e9 (patch) | |
tree | 0643967e1f4018ddb184bdfdee38613a58f72619 | |
parent | 0e601b9f49213afda33a573ea317cb83adbeb714 (diff) | |
parent | 1d06f1337c3d9531ea3e9d5de92658d87853aeac (diff) | |
download | erlang-1d7e5a8b14ba5a269402a1e2186f5c279cd0b2e9.tar.gz |
Merge PR-2625 from max-au/max-au/honour-dist-backlog OTP-16694
inet_tcp_dist: honour {backlog, NNN} setting from inet_dist_listen_options
-rw-r--r-- | lib/kernel/src/inet_tcp_dist.erl | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/kernel/src/inet_tcp_dist.erl b/lib/kernel/src/inet_tcp_dist.erl index 8a67597928..244140c8fb 100644 --- a/lib/kernel/src/inet_tcp_dist.erl +++ b/lib/kernel/src/inet_tcp_dist.erl @@ -101,7 +101,7 @@ gen_listen(Driver, Name, Host) -> end. gen_listen(ErlEpmd, Name, Host, Driver, Options) -> - ListenOptions = listen_options([{backlog,128}|Options]), + ListenOptions = listen_options(Options), case call_epmd_function(ErlEpmd, listen_port_please, [Name, Host]) of {ok, 0} -> {First,Last} = get_port_range(), @@ -143,7 +143,12 @@ listen_options(Opts0) -> end, case application:get_env(kernel, inet_dist_listen_options) of {ok,ListenOpts} -> - ListenOpts ++ Opts1; + case proplists:is_defined(backlog, ListenOpts) of + true -> + ListenOpts ++ Opts1; + false -> + ListenOpts ++ [{backlog, 128} | Opts1] + end; _ -> Opts1 end. |