From c47be57c596ae7e1d65bc22af4485f485545ee6e Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Fri, 27 Jan 2023 12:38:00 +0100
Subject: [PATCH] fix(bridge): ensure all bridge resources are stopped before
 app stop

---
 apps/emqx_bridge/src/emqx_bridge.erl     | 16 ++++++++++++++++
 apps/emqx_bridge/src/emqx_bridge_app.erl |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/apps/emqx_bridge/src/emqx_bridge.erl b/apps/emqx_bridge/src/emqx_bridge.erl
index fb199522d..a25963190 100644
--- a/apps/emqx_bridge/src/emqx_bridge.erl
+++ b/apps/emqx_bridge/src/emqx_bridge.erl
@@ -31,6 +31,7 @@
 
 -export([
     load/0,
+    unload/0,
     lookup/1,
     lookup/2,
     lookup/3,
@@ -75,6 +76,21 @@ load() ->
         maps:to_list(Bridges)
     ).
 
+unload() ->
+    unload_hook(),
+    Bridges = emqx:get_config([bridges], #{}),
+    lists:foreach(
+        fun({Type, NamedConf}) ->
+            lists:foreach(
+                fun({Name, _Conf}) ->
+                    _ = emqx_bridge_resource:stop(Type, Name)
+                end,
+                maps:to_list(NamedConf)
+            )
+        end,
+        maps:to_list(Bridges)
+    ).
+
 safe_load_bridge(Type, Name, Conf, Opts) ->
     try
         _Res = emqx_bridge_resource:create(Type, Name, Conf, Opts),
diff --git a/apps/emqx_bridge/src/emqx_bridge_app.erl b/apps/emqx_bridge/src/emqx_bridge_app.erl
index e10034bae..daae15a17 100644
--- a/apps/emqx_bridge/src/emqx_bridge_app.erl
+++ b/apps/emqx_bridge/src/emqx_bridge_app.erl
@@ -39,7 +39,7 @@ start(_StartType, _StartArgs) ->
 stop(_State) ->
     emqx_conf:remove_handler(?LEAF_NODE_HDLR_PATH),
     emqx_conf:remove_handler(?TOP_LELVE_HDLR_PATH),
-    ok = emqx_bridge:unload_hook(),
+    ok = emqx_bridge:unload(),
     ok.
 
 -if(?EMQX_RELEASE_EDITION == ee).