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

fix(webhook): transport options

This commit is contained in:
Zaiming Shi 2021-03-01 09:48:29 +01:00 committed by Shawn
parent 30293b602a
commit 4aca2c294f
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/emqx_web_hook/src/emqx_web_hook_actions.erl
View File

@ -350,25 +350,24 @@ pool_opts(Params = #{<<"url">> := URL}, ResId) ->
PoolSize = maps:get(<<"pool_size">>, Params, 32), PoolSize = maps:get(<<"pool_size">>, Params, 32),
ConnectTimeout = cuttlefish_duration:parse(str(maps:get(<<"connect_timeout">>, Params, <<"5s">>))), ConnectTimeout = cuttlefish_duration:parse(str(maps:get(<<"connect_timeout">>, Params, <<"5s">>))),
{Inet, Host} = parse_host(Host0), {Inet, Host} = parse_host(Host0),
SslOpts = get_ssl_options(Params, ResId, add_default_scheme(URL)),
[{host, Host}, [{host, Host},
{port, Port}, {port, Port},
{pool_size, PoolSize}, {pool_size, PoolSize},
{pool_type, hash}, {pool_type, hash},
{connect_timeout, ConnectTimeout}, {connect_timeout, ConnectTimeout},
{retry, 5}, {retry, 5},
{retry_timeout, 1000}, {retry_timeout, 1000}
{transport_opts, [Inet] ++ SslOpts}]. | maybe_ssl(Params, ResId, add_default_scheme(URL), Inet)].
pool_name(ResId) -> pool_name(ResId) ->
list_to_atom("webhook:" ++ str(ResId)). list_to_atom("webhook:" ++ str(ResId)).
get_ssl_options(Config, ResId, <<"https://", _URL/binary>>) -> maybe_ssl(Config, ResId, <<"https://", _URL/binary>>, Inet) ->
[{transport, ssl}, [{transport, ssl},
{transport_opts, get_ssl_opts(Config, ResId)} {transport_opts, [Inet | get_ssl_opts(Config, ResId)]}
]; ];
get_ssl_options(_Config, _ResId, _URL) -> maybe_ssl(_Config, _ResId, _URL, Inet) ->
[]. [{transport_opts, [Inet]}].
get_ssl_opts(Opts, ResId) -> get_ssl_opts(Opts, ResId) ->
Dir = filename:join([emqx:get_env(data_dir), "rule", ResId]), Dir = filename:join([emqx:get_env(data_dir), "rule", ResId]),