yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11084 from zhongwencool/hide-plugins-from-cli 

chore: hide plugins from conf load cli
This commit is contained in:
zhongwencool 2023-06-19 19:11:52 +08:00 committed by GitHub
parent 803cd6c812 a578d6fa1d
commit 1f1d61cef6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -15,8 +15,8 @@ endif
# Dashboard version # Dashboard version
# from https://github.com/emqx/emqx-dashboard5 # from https://github.com/emqx/emqx-dashboard5
export EMQX_DASHBOARD_VERSION ?= v1.3.0 export EMQX_DASHBOARD_VERSION ?= v1.3.0-1
export EMQX_EE_DASHBOARD_VERSION ?= e1.1.0-beta.7 export EMQX_EE_DASHBOARD_VERSION ?= e1.1.0-beta.9
# `:=` should be used here, otherwise the `$(shell ...)` will be executed every time when the variable is used # `:=` should be used here, otherwise the `$(shell ...)` will be executed every time when the variable is used
# In make 4.4+, for backward-compatibility the value from the original environment is used. # In make 4.4+, for backward-compatibility the value from the original environment is used.

2
apps/emqx/include/emqx_release.hrl
View File

@ -35,7 +35,7 @@
-define(EMQX_RELEASE_CE, "5.1.0-alpha.5"). -define(EMQX_RELEASE_CE, "5.1.0-alpha.5").
%% Enterprise edition %% Enterprise edition
-define(EMQX_RELEASE_EE, "5.1.0-alpha.7"). -define(EMQX_RELEASE_EE, "5.1.0-alpha.8").
%% The HTTP API version %% The HTTP API version
-define(EMQX_API_VERSION, "5.0"). -define(EMQX_API_VERSION, "5.0").

2
apps/emqx_conf/src/emqx_conf_cli.erl
View File

@ -170,7 +170,7 @@ drop_hidden_roots(Conf) ->
lists:foldl(fun(K, Acc) -> maps:remove(K, Acc) end, Conf, hidden_roots()). lists:foldl(fun(K, Acc) -> maps:remove(K, Acc) end, Conf, hidden_roots()).
hidden_roots() -> hidden_roots() ->
[<<"trace">>, <<"stats">>, <<"broker">>, <<"persistent_session_store">>]. [<<"trace">>, <<"stats">>, <<"broker">>, <<"persistent_session_store">>, <<"plugins">>].
get_config(Key) -> get_config(Key) ->
case emqx:get_raw_config([Key], undefined) of case emqx:get_raw_config([Key], undefined) of