From e3a59c4037e5c961cf30fef04fc097b370c96b5e Mon Sep 17 00:00:00 2001 From: firest Date: Thu, 9 May 2024 16:27:58 +0800 Subject: [PATCH 1/2] fix(sysk): fix that the syskeeper forwarding never reconnecting --- .../src/emqx_bridge_syskeeper_connector.erl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/emqx_bridge_syskeeper/src/emqx_bridge_syskeeper_connector.erl b/apps/emqx_bridge_syskeeper/src/emqx_bridge_syskeeper_connector.erl index a6d47229c..898915f56 100644 --- a/apps/emqx_bridge_syskeeper/src/emqx_bridge_syskeeper_connector.erl +++ b/apps/emqx_bridge_syskeeper/src/emqx_bridge_syskeeper_connector.erl @@ -213,9 +213,9 @@ on_get_status(_InstanceId, #{pool_name := Pool, ack_timeout := AckTimeout}) -> ), status_result(Health). -status_result(true) -> connected; -status_result(false) -> connecting; -status_result({error, _}) -> connecting. +status_result(true) -> ?status_connected; +status_result(false) -> ?status_disconnected; +status_result({error, _}) -> ?status_disconnected. on_add_channel( _InstanceId, @@ -251,7 +251,7 @@ on_get_channels(InstanceId) -> on_get_channel_status(_InstanceId, ChannelId, #{channels := Channels}) -> case maps:is_key(ChannelId, Channels) of true -> - connected; + ?status_connected; _ -> {error, not_exists} end. From 1f3b640a3d65d2216653c85428870631009b5a32 Mon Sep 17 00:00:00 2001 From: firest Date: Thu, 9 May 2024 16:53:31 +0800 Subject: [PATCH 2/2] chore: update change --- apps/emqx_bridge_syskeeper/test/emqx_bridge_syskeeper_SUITE.erl | 2 +- changes/ee/fix-13001.en.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changes/ee/fix-13001.en.md diff --git a/apps/emqx_bridge_syskeeper/test/emqx_bridge_syskeeper_SUITE.erl b/apps/emqx_bridge_syskeeper/test/emqx_bridge_syskeeper_SUITE.erl index 273afffab..9eb882a43 100644 --- a/apps/emqx_bridge_syskeeper/test/emqx_bridge_syskeeper_SUITE.erl +++ b/apps/emqx_bridge_syskeeper/test/emqx_bridge_syskeeper_SUITE.erl @@ -347,7 +347,7 @@ t_get_status(Config) -> _Sleep = 500, _Attempts = 10, ?assertMatch( - #{status := connecting}, + #{status := disconnected}, emqx_bridge_v2:health_check(syskeeper_forwarder, ?SYSKEEPER_NAME) ) ). diff --git a/changes/ee/fix-13001.en.md b/changes/ee/fix-13001.en.md new file mode 100644 index 000000000..5d431e0f5 --- /dev/null +++ b/changes/ee/fix-13001.en.md @@ -0,0 +1 @@ +Fixed an issue where the syskeeper forwarder would never reconnect when the connection was lost.