yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6425 from savonarola/ranch-compat-4.4 

[4.4] fix(wss): update cowboy & ranch for OTP24 compatibility
This commit is contained in:
Ilya Averyanov 2021-12-10 23:25:52 +03:00 committed by GitHub
parent 9f90837b39 c410571ee2
commit 38aa3d637e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rebar.config
View File

@ -41,7 +41,7 @@
, {eredis_cluster, {git, "https://github.com/emqx/eredis_cluster", {tag, "0.6.5"}}}
, {gproc, {git, "https://github.com/uwiger/gproc", {tag, "0.8.0"}}}
, {jiffy, {git, "https://github.com/emqx/jiffy", {tag, "1.0.5"}}}
, {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.8.2"}}}
, {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.9.0"}}}
, {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.8.0"}}}
, {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.8.2"}}}
, {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.7.0"}}}

7
test/emqx_listeners_SUITE.erl
View File

@ -47,6 +47,12 @@ t_restart_listeners(_) ->
ok = emqx_listeners:restart(),
ok = emqx_listeners:stop().
t_wss_conn(_) ->
ok = emqx_listeners:start(),
{ok, Socket} = ssl:connect({127, 0, 0, 1}, 8084, [{verify, verify_none}], 1000),
ok = ssl:close(Socket),
ok = emqx_listeners:stop().
render_config_file() ->
Path = local_path(["..", "..", "..", "..", "etc", "emqx.conf"]),
{ok, Temp} = file:read_file(Path),
@ -91,4 +97,3 @@ get_base_dir(Module) ->
get_base_dir() ->
get_base_dir(?MODULE).