From ed1ad4e684abf4526f9934431a33239aefeab62e Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Fri, 2 Jun 2023 15:08:44 +0200
Subject: [PATCH 1/3] chore(emqx_schema): add 'eanble' as an alias to 'enabled'
 fields

---
 apps/emqx/src/emqx_schema.erl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/emqx/src/emqx_schema.erl b/apps/emqx/src/emqx_schema.erl
index 521293f7a..f836ac12f 100644
--- a/apps/emqx/src/emqx_schema.erl
+++ b/apps/emqx/src/emqx_schema.erl
@@ -301,6 +301,8 @@ fields("persistent_session_store") ->
                 boolean(),
                 #{
                     default => false,
+                    %% TODO(5.2): change field name to 'enable' and keep 'enabled' as an alias
+                    aliases => [enable],
                     desc => ?DESC(persistent_session_store_enabled)
                 }
             )},
@@ -1989,6 +1991,8 @@ base_listener(Bind) ->
                 boolean(),
                 #{
                     default => true,
+                    %% TODO(5.2): change field name to 'enable' and keep 'enabled' as an alias
+                    aliases => [enable],
                     desc => ?DESC(fields_listener_enabled)
                 }
             )},

From 1e0b2de0ea97cba6ab799d2ef5a391b86947e9fd Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Fri, 2 Jun 2023 15:09:34 +0200
Subject: [PATCH 2/3] chore: refine data sync debug log messages

---
 apps/emqx_conf/src/emqx_conf_app.erl | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/apps/emqx_conf/src/emqx_conf_app.erl b/apps/emqx_conf/src/emqx_conf_app.erl
index 70234b525..1065e8993 100644
--- a/apps/emqx_conf/src/emqx_conf_app.erl
+++ b/apps/emqx_conf/src/emqx_conf_app.erl
@@ -210,9 +210,13 @@ sync_data_from_node(Node) ->
         {ok, DataBin} ->
             case zip:unzip(DataBin, [{cwd, emqx:data_dir()}]) of
                 {ok, []} ->
-                    ?SLOG(debug, #{node => Node, msg => "sync_data_from_node_ignore"});
+                    ?SLOG(debug, #{node => Node, msg => "sync_data_from_node_empty_response"});
                 {ok, Files} ->
-                    ?SLOG(debug, #{node => Node, msg => "sync_data_from_node_ok", files => Files})
+                    ?SLOG(debug, #{
+                        node => Node,
+                        msg => "sync_data_from_node_non_empty_response",
+                        files => Files
+                    })
             end,
             ok;
         Error ->

From abdbf3409d8cdeac98ecb2b0778d10efcd982a2b Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Wed, 7 Jun 2023 20:29:22 +0200
Subject: [PATCH 3/3] feat: add changelog for #10926

---
 changes/ce/feat-10926.en.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 changes/ce/feat-10926.en.md

diff --git a/changes/ce/feat-10926.en.md b/changes/ce/feat-10926.en.md
new file mode 100644
index 000000000..607dd06de
--- /dev/null
+++ b/changes/ce/feat-10926.en.md
@@ -0,0 +1,5 @@
+Allow 'enable' as well as 'enabled' as the state flag for listeners.
+
+Prior to this change, listener can be enable/disabled by setting the 'true' or 'false' on the 'enabled' config.
+This is slightly different naming comparing to other state flags in the system.
+No the 'enable' flag is added as an aliase on listeners.