From bafcb7f34a534009d2693771926858f55e3a5e74 Mon Sep 17 00:00:00 2001
From: Shawn <506895667@qq.com>
Date: Mon, 9 Aug 2021 13:35:02 +0800
Subject: [PATCH] fix(emqx_config): always return atom-key map for
 emqx_config:get/2

---
 apps/emqx/src/emqx_config.erl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/emqx/src/emqx_config.erl b/apps/emqx/src/emqx_config.erl
index 5a95340a8..151cf8e8e 100644
--- a/apps/emqx/src/emqx_config.erl
+++ b/apps/emqx/src/emqx_config.erl
@@ -302,7 +302,7 @@ do_get(Type, KeyPath) ->
 do_get(Type, [], Default) ->
     AllConf = lists:foldl(fun
             ({?PERSIS_KEY(Type0, RootName), Conf}, AccIn) when Type0 == Type ->
-                AccIn#{RootName => Conf};
+                AccIn#{conf_key(Type0, RootName) => Conf};
             (_, AccIn) -> AccIn
         end, #{}, persistent_term:get()),
     case map_size(AllConf) == 0 of
@@ -343,3 +343,8 @@ atom(Atom) when is_atom(Atom) ->
 
 bin(Bin) when is_binary(Bin) -> Bin;
 bin(Atom) when is_atom(Atom) -> atom_to_binary(Atom, utf8).
+
+conf_key(?CONF, RootName) ->
+    atom(RootName);
+conf_key(?RAW_CONF, RootName) ->
+    bin(RootName).