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

fix(webhook): fix bad ssl options

This commit is contained in:
zhouzb 2021-06-01 20:29:55 +08:00 committed by turtleDeng
parent 6b8910e26c
commit 443b83624c
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx_web_hook/src/emqx_web_hook.app.src
View File

@ -1,6 +1,6 @@
{application, emqx_web_hook, {application, emqx_web_hook,
[{description, "EMQ X WebHook Plugin"}, [{description, "EMQ X WebHook Plugin"},
{vsn, "4.3.0"}, % strict semver, bump manually! {vsn, "4.3.1"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_web_hook_sup]}, {registered, [emqx_web_hook_sup]},
{applications, [kernel,stdlib,ehttpc]}, {applications, [kernel,stdlib,ehttpc]},

6
apps/emqx_web_hook/src/emqx_web_hook.appup.src
View File

@ -2,9 +2,15 @@
{VSN, {VSN,
[ [
{"4.3.0", [
{load_module, emqx_web_hook_actions, brutal_purge, soft_purge, []}
]},
{<<".*">>, []} {<<".*">>, []}
], ],
[ [
{"4.3.0", [
{load_module, emqx_web_hook_actions, brutal_purge, soft_purge, []}
]},
{<<".*">>, []} {<<".*">>, []}
] ]
}. }.

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

@ -353,7 +353,7 @@ pool_name(ResId) ->
list_to_atom("webhook:" ++ str(ResId)). list_to_atom("webhook:" ++ str(ResId)).
get_ssl_opts(Opts, ResId) -> get_ssl_opts(Opts, ResId) ->
[{ssl, true}, {ssl_opts, emqx_plugin_libs_ssl:save_files_return_opts(Opts, "rules", ResId)}]. emqx_plugin_libs_ssl:save_files_return_opts(Opts, "rules", ResId).
test_http_connect(Conf) -> test_http_connect(Conf) ->
Url = fun() -> maps:get(<<"url">>, Conf) end, Url = fun() -> maps:get(<<"url">>, Conf) end,