From 1c03c236f5cfcac14befb6c17b34a93ec5408f42 Mon Sep 17 00:00:00 2001
From: Shawn <506895667@qq.com>
Date: Wed, 14 Sep 2022 15:19:30 +0800
Subject: [PATCH] fix(mqtt_bridge): handle send_to_remote in idle state

---
 apps/emqx_connector/src/mqtt/emqx_connector_mqtt_worker.erl | 6 +++++-
 apps/emqx_resource/src/emqx_resource_manager.erl            | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_worker.erl b/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_worker.erl
index 618361ad3..5f81e68e1 100644
--- a/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_worker.erl
+++ b/apps/emqx_connector/src/mqtt/emqx_connector_mqtt_worker.erl
@@ -276,6 +276,8 @@ idle({call, From}, ensure_started, State) ->
         {error, Reason, _State} ->
             {keep_state_and_data, [{reply, From, {error, Reason}}]}
     end;
+idle({call, From}, send_to_remote, _State) ->
+    {keep_state_and_data, [{reply, From, {error, {recoverable_error, not_connected}}}]};
 %% @doc Standing by for manual start.
 idle(info, idle, #{start_type := manual}) ->
     keep_state_and_data;
@@ -339,10 +341,12 @@ common(_StateName, {call, From}, get_forwards, #{connect_opts := #{forwards := F
     {keep_state_and_data, [{reply, From, Forwards}]};
 common(_StateName, {call, From}, get_subscriptions, #{connection := Connection}) ->
     {keep_state_and_data, [{reply, From, maps:get(subscriptions, Connection, #{})}]};
+common(_StateName, {call, From}, Req, _State) ->
+    {keep_state_and_data, [{reply, From, {unsuppored_request, Req}}]};
 common(_StateName, info, {'EXIT', _, _}, State) ->
     {keep_state, State};
 common(StateName, Type, Content, #{name := Name} = State) ->
-    ?SLOG(notice, #{
+    ?SLOG(error, #{
         msg => "bridge_discarded_event",
         name => Name,
         type => Type,
diff --git a/apps/emqx_resource/src/emqx_resource_manager.erl b/apps/emqx_resource/src/emqx_resource_manager.erl
index e4ba92b5c..a896e990e 100644
--- a/apps/emqx_resource/src/emqx_resource_manager.erl
+++ b/apps/emqx_resource/src/emqx_resource_manager.erl
@@ -467,11 +467,11 @@ retry_actions(Data) ->
 
 handle_remove_event(From, ClearMetrics, Data) ->
     stop_resource(Data),
+    ok = emqx_resource_worker_sup:stop_workers(Data#data.id, Data#data.opts),
     case ClearMetrics of
         true -> ok = emqx_metrics_worker:clear_metrics(?RES_METRICS, Data#data.id);
         false -> ok
     end,
-    ok = emqx_resource_worker_sup:stop_workers(Data#data.id, Data#data.opts),
     {stop_and_reply, normal, [{reply, From, ok}]}.
 
 start_resource(Data, From) ->