From 17d70772a8fe63b520f2c9b81ba3e213310ae473 Mon Sep 17 00:00:00 2001 From: Zaiming Shi Date: Sat, 23 Jan 2021 10:55:00 +0100 Subject: [PATCH 1/4] refactor(emqx_recon): Use latest version recon Moved recon dependency from emqx_recon to root --- apps/emqx_recon/rebar.config | 2 +- rebar.config | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/emqx_recon/rebar.config b/apps/emqx_recon/rebar.config index adb1d4c65..1a6f20d2b 100644 --- a/apps/emqx_recon/rebar.config +++ b/apps/emqx_recon/rebar.config @@ -1,5 +1,5 @@ {deps, [ - {recon, {git, "https://github.com/ferd/recon", {tag, "2.5.0"}}} +%% recon "https://github.com/ferd/recon" at root rebar.config ]}. {edoc_opts, [{preprocess, true}]}. diff --git a/rebar.config b/rebar.config index d97511c69..bed07d569 100644 --- a/rebar.config +++ b/rebar.config @@ -54,6 +54,7 @@ , {pbkdf2, {git, "https://github.com/emqx/erlang-pbkdf2.git", {branch, "2.0.4"}}} , {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.2.3"}}} , {rulesql, {git, "https://github.com/emqx/rulesql", {tag, "0.1.2"}}} + , {recon, {git, "https://github.com/ferd/recon", {tag, "2.5.1"}}} , {getopt, "1.0.1"} ]}. From de972b3d846da3744871bbad7e45fd4fb3b46b35 Mon Sep 17 00:00:00 2001 From: Zaiming Shi Date: Sat, 23 Jan 2021 11:00:41 +0100 Subject: [PATCH 2/4] fix(emqx_vm): Call recon_alloc:allocators/0 to get allocators --- src/emqx_vm.erl | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/emqx_vm.erl b/src/emqx_vm.erl index e1ab29b8b..5094eea03 100644 --- a/src/emqx_vm.erl +++ b/src/emqx_vm.erl @@ -275,14 +275,8 @@ util_alloc()-> alloc(?UTIL_ALLOCATORS). alloc(Type) -> - [{{T, Instance}, Props} || {{T, Instance}, Props} <- allocators(), lists:member(T, Type)]. - -allocators() -> - UtilAllocators = erlang:system_info(alloc_util_allocators), - Allocators = [sys_alloc, mseg_alloc|UtilAllocators], - [{{A, N}, lists:sort(proplists:delete(versions, Props))} || - A <- Allocators, Allocs <- [erlang:system_info({allocator, A})], - Allocs =/= false, {_, N, Props} <- Allocs]. + [{{T, Instance}, Props} || + {{T, Instance}, Props} <- recon_alloc:allocators(), lists:member(T, Type)]. container_size(Prop, Keyword, Container) -> Sbcs = container_value(Prop, Keyword, sbcs, Container), From b25dedccc929579af8a7b70f3186e5cbbcc74356 Mon Sep 17 00:00:00 2001 From: zhouzb Date: Mon, 18 Jan 2021 09:17:24 +0800 Subject: [PATCH 3/4] refactor(inet parse): refactor inet parse --- .../emqx_auth_http/src/emqx_auth_http_app.erl | 26 ++++++++--------- .../src/emqx_web_hook_actions.erl | 26 ++++++++--------- apps/emqx_web_hook/src/emqx_web_hook_app.erl | 28 +++++++++---------- 3 files changed, 37 insertions(+), 43 deletions(-) diff --git a/apps/emqx_auth_http/src/emqx_auth_http_app.erl b/apps/emqx_auth_http/src/emqx_auth_http_app.erl index 487201e8e..e857fc681 100644 --- a/apps/emqx_auth_http/src/emqx_auth_http_app.erl +++ b/apps/emqx_auth_http/src/emqx_auth_http_app.erl @@ -61,20 +61,7 @@ translate_env(EnvName) -> _ -> 80 end), Path = path(Path0), - Host = case inet:parse_address(Host0) of - {ok, {_,_,_,_} = Addr} -> Addr; - {ok, {_,_,_,_,_,_,_,_} = Addr} -> Addr; - {error, einval} -> Host0 - end, - Inet = case Host of - {_,_,_,_} -> inet; - {_,_,_,_,_,_,_,_} -> inet6; - _ -> - case inet:getaddr(Host, inet6) of - {error, _} -> inet; - {ok, _} -> inet6 - end - end, + {Inet, Host} = parse_host(Host0), MoreOpts = case Scheme of "http" -> [{transport_opts, [Inet]}]; @@ -152,6 +139,17 @@ unload_hooks() -> ehttpc_sup:stop_pool('emqx_auth_http/acl_req'), ok. +parse_host(Host) -> + case inet:parse_address(Host) of + {ok, Addr} when size(Addr) =:= 4 -> {inet, Addr}; + {ok, Addr} when size(Addr) =:= 8 -> {inet6, Addr}; + {error, einval} -> + case inet:getaddr(Host, inet6) of + {ok, _} -> {inet6, Host}; + {error, _} -> {inet, Host} + end + end. + to_lower(Headers) -> [{string:to_lower(K), V} || {K, V} <- Headers]. diff --git a/apps/emqx_web_hook/src/emqx_web_hook_actions.erl b/apps/emqx_web_hook/src/emqx_web_hook_actions.erl index cc585d1f1..7e7a901c9 100644 --- a/apps/emqx_web_hook/src/emqx_web_hook_actions.erl +++ b/apps/emqx_web_hook/src/emqx_web_hook_actions.erl @@ -340,20 +340,7 @@ pool_opts(Params = #{<<"url">> := URL}) -> end), PoolSize = maps:get(<<"pool_size">>, Params, 32), ConnectTimeout = timer:seconds(maps:get(<<"connect_timeout">>, Params, 5)), - Host = case inet:parse_address(Host0) of - {ok, {_,_,_,_} = Addr} -> Addr; - {ok, {_,_,_,_,_,_,_,_} = Addr} -> Addr; - {error, einval} -> Host0 - end, - Inet = case Host of - {_,_,_,_} -> inet; - {_,_,_,_,_,_,_,_} -> inet6; - _ -> - case inet:getaddr(Host, inet6) of - {error, _} -> inet; - {ok, _} -> inet6 - end - end, + {Inet, Host} = parse_host(Host0), MoreOpts = case Scheme of "http" -> [{transport_opts, [Inet]}]; @@ -388,3 +375,14 @@ pool_opts(Params = #{<<"url">> := URL}) -> pool_name(ResId) -> list_to_atom("webhook:" ++ str(ResId)). + +parse_host(Host) -> + case inet:parse_address(Host) of + {ok, Addr} when size(Addr) =:= 4 -> {inet, Addr}; + {ok, Addr} when size(Addr) =:= 8 -> {inet6, Addr}; + {error, einval} -> + case inet:getaddr(Host, inet6) of + {ok, _} -> {inet6, Host}; + {error, _} -> {inet, Host} + end + end. diff --git a/apps/emqx_web_hook/src/emqx_web_hook_app.erl b/apps/emqx_web_hook/src/emqx_web_hook_app.erl index 2c0697c81..2ec8ebf42 100644 --- a/apps/emqx_web_hook/src/emqx_web_hook_app.erl +++ b/apps/emqx_web_hook/src/emqx_web_hook_app.erl @@ -58,20 +58,7 @@ translate_env() -> _ -> 80 end), Path = path(Path0), - Host = case inet:parse_address(Host0) of - {ok, {_,_,_,_} = Addr} -> Addr; - {ok, {_,_,_,_,_,_,_,_} = Addr} -> Addr; - {error, einval} -> Host0 - end, - Inet = case Host of - {_,_,_,_} -> inet; - {_,_,_,_,_,_,_,_} -> inet6; - _ -> - case inet:getaddr(Host, inet6) of - {error, _} -> inet; - {ok, _} -> inet6 - end - end, + {Inet, Host} = parse_host(Host0), PoolSize = application:get_env(?APP, pool_size, 32), MoreOpts = case Scheme of "http" -> @@ -118,4 +105,15 @@ path(Path) -> set_content_type(Headers) -> NHeaders = proplists:delete(<<"Content-Type">>, proplists:delete(<<"content-type">>, Headers)), - [{<<"content-type">>, <<"application/json">>} | NHeaders]. \ No newline at end of file + [{<<"content-type">>, <<"application/json">>} | NHeaders]. + +parse_host(Host) -> + case inet:parse_address(Host) of + {ok, Addr} when size(Addr) =:= 4 -> {inet, Addr}; + {ok, Addr} when size(Addr) =:= 8 -> {inet6, Addr}; + {error, einval} -> + case inet:getaddr(Host, inet6) of + {ok, _} -> {inet6, Host}; + {error, _} -> {inet, Host} + end + end. \ No newline at end of file From 670c3894fbe21980114540c2060302743b3836da Mon Sep 17 00:00:00 2001 From: JianBo He Date: Mon, 25 Jan 2021 13:36:06 +0800 Subject: [PATCH 4/4] chore(redis): upgrade eredis_cluster to 0.6.4 --- apps/emqx_auth_redis/rebar.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/emqx_auth_redis/rebar.config b/apps/emqx_auth_redis/rebar.config index a85b22fd1..72c91aa4e 100644 --- a/apps/emqx_auth_redis/rebar.config +++ b/apps/emqx_auth_redis/rebar.config @@ -1,5 +1,5 @@ {deps, - [{eredis_cluster, {git, "https://github.com/emqx/eredis_cluster", {tag, "0.6.3"}}} + [{eredis_cluster, {git, "https://github.com/emqx/eredis_cluster", {tag, "0.6.4"}}} ]}. {erl_opts, [warn_unused_vars,