From bb1237880671f28c0a16521bcfd1adabec3589aa Mon Sep 17 00:00:00 2001 From: EMQ-YangM Date: Fri, 25 Mar 2022 17:35:55 +0800 Subject: [PATCH 1/3] fix(emqx_resource_instance): improve the pattern match of the function call_health_check --- apps/emqx_resource/src/emqx_resource_instance.erl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/emqx_resource/src/emqx_resource_instance.erl b/apps/emqx_resource/src/emqx_resource_instance.erl index 059ceefdf..41852cafb 100644 --- a/apps/emqx_resource/src/emqx_resource_instance.erl +++ b/apps/emqx_resource/src/emqx_resource_instance.erl @@ -295,6 +295,11 @@ do_health_check(Group, #{id := InstId, mod := Mod, state := ResourceState0} = Da ets:insert(emqx_resource_instance, {InstId, Group, Data#{status => connected, state => ResourceState1}}), ok; + {error, Reason} -> + logger:error("health check for ~p failed: ~p", [InstId, Reason]), + ets:insert(emqx_resource_instance, + {InstId, Group, Data#{status => connecting}}), + {error, Reason}; {error, Reason, ResourceState1} -> logger:error("health check for ~p failed: ~p", [InstId, Reason]), ets:insert(emqx_resource_instance, From 6b662d87ba6972f2f682368d7dafef5c01388939 Mon Sep 17 00:00:00 2001 From: EMQ-YangM Date: Fri, 25 Mar 2022 18:15:23 +0800 Subject: [PATCH 2/3] fix(emqx_resource): fix dialyzer warning --- apps/emqx_resource/src/emqx_resource.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/emqx_resource/src/emqx_resource.erl b/apps/emqx_resource/src/emqx_resource.erl index bbafcf43d..8153907f6 100644 --- a/apps/emqx_resource/src/emqx_resource.erl +++ b/apps/emqx_resource/src/emqx_resource.erl @@ -265,7 +265,7 @@ call_start(InstId, Mod, Config) -> ?SAFE_CALL(Mod:on_start(InstId, Config)). -spec call_health_check(instance_id(), module(), resource_state()) -> - {ok, resource_state()} | {error, Reason:: term(), resource_state()}. + {ok, resource_state()} | {error, Reason:: term()} | {error, Reason:: term(), resource_state()}. call_health_check(InstId, Mod, ResourceState) -> ?SAFE_CALL(Mod:on_health_check(InstId, ResourceState)). From 9a2d70f98e3b00f8661df5c2c2c616d01cf04cc4 Mon Sep 17 00:00:00 2001 From: EMQ-YangM Date: Fri, 25 Mar 2022 18:26:18 +0800 Subject: [PATCH 3/3] fix(emqx_resource): remove extra space --- apps/emqx_resource/src/emqx_resource.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/emqx_resource/src/emqx_resource.erl b/apps/emqx_resource/src/emqx_resource.erl index 8153907f6..99d663b09 100644 --- a/apps/emqx_resource/src/emqx_resource.erl +++ b/apps/emqx_resource/src/emqx_resource.erl @@ -265,7 +265,7 @@ call_start(InstId, Mod, Config) -> ?SAFE_CALL(Mod:on_start(InstId, Config)). -spec call_health_check(instance_id(), module(), resource_state()) -> - {ok, resource_state()} | {error, Reason:: term()} | {error, Reason:: term(), resource_state()}. + {ok, resource_state()} | {error, Reason:: term()} | {error, Reason:: term(), resource_state()}. call_health_check(InstId, Mod, ResourceState) -> ?SAFE_CALL(Mod:on_health_check(InstId, ResourceState)).