From 853ead3aafdcbfb576a0bdbf5addd7ea4d4856e2 Mon Sep 17 00:00:00 2001
From: Zhongwen Deng <zhongwencool@gmail.com>
Date: Tue, 7 Jun 2022 22:18:21 +0800
Subject: [PATCH] fix: reload ssl listener failed

---
 apps/emqx/src/emqx_listeners.erl               | 6 +++---
 apps/emqx/test/emqx_mqtt_protocol_v5_SUITE.erl | 3 +++
 apps/emqx/test/emqx_takeover_SUITE.erl         | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/apps/emqx/src/emqx_listeners.erl b/apps/emqx/src/emqx_listeners.erl
index 1327d5caa..2a73efd70 100644
--- a/apps/emqx/src/emqx_listeners.erl
+++ b/apps/emqx/src/emqx_listeners.erl
@@ -557,18 +557,18 @@ certs_dir(Type, Name) ->
     iolist_to_binary(filename:join(["listeners", Type, Name])).
 
 convert_certs(CertsDir, Conf) ->
-    case emqx_tls_lib:ensure_ssl_files(CertsDir, maps:get(<<"ssl">>, Conf, undefined)) of
+    case emqx_tls_lib:ensure_ssl_files(CertsDir, maps:get(<<"ssl_options">>, Conf, undefined)) of
         {ok, undefined} ->
             Conf;
         {ok, SSL} ->
-            Conf#{<<"ssl">> => SSL};
+            Conf#{<<"ssl_options">> => SSL};
         {error, Reason} ->
             ?SLOG(error, Reason#{msg => "bad_ssl_config"}),
             throw({bad_ssl_config, Reason})
     end.
 
 clear_certs(CertsDir, Conf) ->
-    OldSSL = maps:get(<<"ssl">>, Conf, undefined),
+    OldSSL = maps:get(<<"ssl_options">>, Conf, undefined),
     emqx_tls_lib:delete_ssl_files(CertsDir, undefined, OldSSL).
 
 filter_stacktrace({Reason, _Stacktrace}) -> Reason;
diff --git a/apps/emqx/test/emqx_mqtt_protocol_v5_SUITE.erl b/apps/emqx/test/emqx_mqtt_protocol_v5_SUITE.erl
index 887cf2a3e..5ef43e738 100644
--- a/apps/emqx/test/emqx_mqtt_protocol_v5_SUITE.erl
+++ b/apps/emqx/test/emqx_mqtt_protocol_v5_SUITE.erl
@@ -70,6 +70,9 @@ init_per_group(_, Config) ->
     emqx_common_test_helpers:stop_apps([]),
     Config.
 
+end_per_group(quic, _Config) ->
+    emqx_config:put([listeners, quic], #{}),
+    ok;
 end_per_group(_Group, _Config) ->
     ok.
 
diff --git a/apps/emqx/test/emqx_takeover_SUITE.erl b/apps/emqx/test/emqx_takeover_SUITE.erl
index ab3474a32..beb7817af 100644
--- a/apps/emqx/test/emqx_takeover_SUITE.erl
+++ b/apps/emqx/test/emqx_takeover_SUITE.erl
@@ -33,9 +33,10 @@
 all() -> emqx_common_test_helpers:all(?MODULE).
 
 init_per_suite(Config) ->
+    emqx_channel_SUITE:set_test_listener_confs(),
     ?check_trace(
         ?wait_async_action(
-            emqx_common_test_helpers:start_apps([emqx_conf]),
+            emqx_common_test_helpers:start_apps([]),
             #{?snk_kind := listener_started, bind := 1883},
             timer:seconds(10)
         ),