From 72664780df756891da7e2a570e70ae8741191006 Mon Sep 17 00:00:00 2001 From: Thales Macedo Garitezi Date: Mon, 1 Jul 2024 11:17:01 -0300 Subject: [PATCH] fix(http action): use correct return value for channel health check Fixes https://emqx.atlassian.net/browse/EMQX-12622 --- apps/emqx_bridge_http/src/emqx_bridge_http.app.src | 2 +- .../src/emqx_bridge_http_connector.erl | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/apps/emqx_bridge_http/src/emqx_bridge_http.app.src b/apps/emqx_bridge_http/src/emqx_bridge_http.app.src index 5a52cc047..8b8d379e4 100644 --- a/apps/emqx_bridge_http/src/emqx_bridge_http.app.src +++ b/apps/emqx_bridge_http/src/emqx_bridge_http.app.src @@ -1,6 +1,6 @@ {application, emqx_bridge_http, [ {description, "EMQX HTTP Bridge and Connector Application"}, - {vsn, "0.3.2"}, + {vsn, "0.3.3"}, {registered, []}, {applications, [kernel, stdlib, emqx_resource, ehttpc]}, {env, [ diff --git a/apps/emqx_bridge_http/src/emqx_bridge_http_connector.erl b/apps/emqx_bridge_http/src/emqx_bridge_http_connector.erl index 785424c67..91a0878c3 100644 --- a/apps/emqx_bridge_http/src/emqx_bridge_http_connector.erl +++ b/apps/emqx_bridge_http/src/emqx_bridge_http_connector.erl @@ -640,8 +640,14 @@ on_get_channel_status( _ChannelId, State ) -> - %% XXX: Reuse the connector status - on_get_status(InstId, State). + %% N.B.: `on_get_channel_status' expects a different return value than + %% `on_get_status'. + case on_get_status(InstId, State, fun default_health_checker/2) of + {Status, _State, Reason} -> + {Status, Reason}; + Res -> + Res + end. on_format_query_result({ok, Status, Headers, Body}) -> #{