fix emqttd_ctl crashed when emq_auth_usename doesn't exist

This commit is contained in:
terry-xiaoyu 2018-05-04 17:28:16 +08:00
parent e7e8131f2a
commit 849f0aaef7
2 changed files with 22 additions and 14 deletions

View File

@ -30,7 +30,7 @@
-export([load/0]). -export([load/0]).
-export([status/1, broker/1, cluster/1, users/1, clients/1, sessions/1, -export([status/1, broker/1, cluster/1, clients/1, sessions/1,
routes/1, topics/1, subscriptions/1, plugins/1, bridges/1, routes/1, topics/1, subscriptions/1, plugins/1, bridges/1,
listeners/1, vm/1, mnesia/1, trace/1, acl/1]). listeners/1, vm/1, mnesia/1, trace/1, acl/1]).
@ -152,9 +152,7 @@ cluster(_) ->
{"cluster status", "Cluster status"}]). {"cluster status", "Cluster status"}]).
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
%% @doc Users usage %% @doc ACL reload
users(Args) -> emq_auth_username:cli(Args).
acl(["reload"]) -> emqttd_access_control:reload_acl(); acl(["reload"]) -> emqttd_access_control:reload_acl();
acl(_) -> ?USAGE([{"acl reload", "reload etc/acl.conf"}]). acl(_) -> ?USAGE([{"acl reload", "reload etc/acl.conf"}]).
@ -607,4 +605,3 @@ format(_, Val) ->
Val. Val.
bin(S) -> iolist_to_binary(S). bin(S) -> iolist_to_binary(S).

View File

@ -99,7 +99,7 @@ list() ->
case emqttd:env(plugins_etc_dir) of case emqttd:env(plugins_etc_dir) of
{ok, PluginsEtc} -> {ok, PluginsEtc} ->
CfgFiles = filelib:wildcard("*.{conf,config}", PluginsEtc), CfgFiles = filelib:wildcard("*.{conf,config}", PluginsEtc),
Plugins = [plugin(CfgFile) || CfgFile <- CfgFiles], Plugins = all_plugin_attrs(CfgFiles),
StartedApps = names(started_app), StartedApps = names(started_app),
lists:map(fun(Plugin = #mqtt_plugin{name = Name}) -> lists:map(fun(Plugin = #mqtt_plugin{name = Name}) ->
case lists:member(Name, StartedApps) of case lists:member(Name, StartedApps) of
@ -111,12 +111,24 @@ list() ->
[] []
end. end.
all_plugin_attrs(CfgFiles) ->
lists:foldl(
fun(CfgFile, Acc) ->
case plugin(CfgFile) of
not_found -> Acc;
Attr -> Acc ++ [Attr]
end
end, [], CfgFiles).
plugin(CfgFile) -> plugin(CfgFile) ->
AppName = app_name(CfgFile), AppName = app_name(CfgFile),
{ok, Attrs} = application:get_all_key(AppName), case application:get_all_key(AppName) of
{ok, Attrs} ->
Ver = proplists:get_value(vsn, Attrs, "0"), Ver = proplists:get_value(vsn, Attrs, "0"),
Descr = proplists:get_value(description, Attrs, ""), Descr = proplists:get_value(description, Attrs, ""),
#mqtt_plugin{name = AppName, version = Ver, descr = Descr}. #mqtt_plugin{name = AppName, version = Ver, descr = Descr};
_ -> not_found
end.
%% @doc Load a Plugin %% @doc Load a Plugin
-spec(load(atom()) -> ok | {error, term()}). -spec(load(atom()) -> ok | {error, term()}).
@ -269,4 +281,3 @@ write_loaded(AppNames) ->
lager:error("Open File ~p Error: ~p", [File, Error]), lager:error("Open File ~p Error: ~p", [File, Error]),
{error, Error} {error, Error}
end. end.