Skip to content

Commit 5d7955b

Browse files
committed
Fix config options merging
1 parent 9a4b313 commit 5d7955b

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

lib/thousand_island/transports/ssl.ex

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,10 @@ defmodule ThousandIsland.Transports.SSL do
5757
reuseaddr: true
5858
]
5959

60-
resolved_options = @hardcoded_options ++ user_options ++ default_options
60+
resolved_options =
61+
default_options
62+
|> Keyword.merge(user_options)
63+
|> Keyword.merge(@hardcoded_options)
6164

6265
if not Enum.any?(
6366
[:keyfile, :key, :sni_hosts, :sni_fun],

lib/thousand_island/transports/tcp.ex

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,11 @@ defmodule ThousandIsland.Transports.TCP do
5555
reuseaddr: true
5656
]
5757

58-
resolved_options = @hardcoded_options ++ user_options ++ default_options
58+
resolved_options =
59+
default_options
60+
|> Keyword.merge(user_options)
61+
|> Keyword.merge(@hardcoded_options)
62+
5963
:gen_tcp.listen(port, resolved_options)
6064
end
6165

0 commit comments

Comments
 (0)