diff --git a/apps/emqx/test/emqx_authentication_SUITE.erl b/apps/emqx/test/emqx_authentication_SUITE.erl index 652b634ca..5f3e28bf3 100644 --- a/apps/emqx/test/emqx_authentication_SUITE.erl +++ b/apps/emqx/test/emqx_authentication_SUITE.erl @@ -296,7 +296,7 @@ t_update_config({init, Config}) -> | Config ]; t_update_config(Config) when is_list(Config) -> - emqx_config_handler:add_handler([?CONF_ROOT], emqx_authentication), + emqx_config_handler:add_handler([?CONF_ROOT], emqx_authentication_config), ok = register_provider(?config("auth1"), ?MODULE), ok = register_provider(?config("auth2"), ?MODULE), Global = ?config(global), diff --git a/apps/emqx_conf/src/emqx_conf_cli.erl b/apps/emqx_conf/src/emqx_conf_cli.erl index 7df7f669b..7c391d2d1 100644 --- a/apps/emqx_conf/src/emqx_conf_cli.erl +++ b/apps/emqx_conf/src/emqx_conf_cli.erl @@ -33,15 +33,6 @@ unload() -> emqx_ctl:unregister_command(?CLUSTER_CALL), emqx_ctl:unregister_command(?CONF). -conf(["reload"]) -> - ConfFiles = lists:flatten(lists:join(",", application:get_env(emqx, config_files, []))), - case emqx_config:reload_etc_conf_on_local_node() of - [] -> - emqx_ctl:print("reload ~s success~n", [ConfFiles]); - Error -> - emqx_ctl:print("reload ~s failed:~n", [ConfFiles]), - print(Error) - end; conf(["print", "--only-keys"]) -> print(emqx_config:get_root_names()); conf(["print"]) ->