From f3420e88108b28f31ced2a35ffa29ff33e35487d Mon Sep 17 00:00:00 2001 From: wwhai <751957846@qq.com> Date: Mon, 25 Jan 2021 10:47:09 +0800 Subject: [PATCH] fix(rule-engine): fix update resource maybe remove resource --- apps/emqx_rule_engine/src/emqx_rule_engine.erl | 3 +-- apps/emqx_web_hook/src/emqx_web_hook_actions.erl | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/emqx_rule_engine/src/emqx_rule_engine.erl b/apps/emqx_rule_engine/src/emqx_rule_engine.erl index 26f6ef738..4f41f9d55 100644 --- a/apps/emqx_rule_engine/src/emqx_rule_engine.erl +++ b/apps/emqx_rule_engine/src/emqx_rule_engine.erl @@ -297,8 +297,7 @@ do_update_resource(#{id := Id, type := Type, description:= NewDescription, confi type = Type, config = Config, description = NewDescription, - created_at = erlang:system_time(millisecond)}), - cluster_call(clear_resource, [Module, Destroy, Id]) + created_at = erlang:system_time(millisecond)}) end. -spec(start_resource(resource_id()) -> ok | {error, Reason :: term()}). 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 0abd1553b..cc585d1f1 100644 --- a/apps/emqx_web_hook/src/emqx_web_hook_actions.erl +++ b/apps/emqx_web_hook/src/emqx_web_hook_actions.erl @@ -355,9 +355,9 @@ pool_opts(Params = #{<<"url">> := URL}) -> end end, MoreOpts = case Scheme of - <<"http">> -> + "http" -> [{transport_opts, [Inet]}]; - <<"https">> -> + "https" -> KeyFile = maps:get(<<"keyfile">>, Params), CertFile = maps:get(<<"certfile">>, Params), CACertFile = maps:get(<<"cacertfile">>, Params),