Fix error exit code from emqttd_ctl

This commit is contained in:
turtled 2017-07-06 11:25:05 +08:00
parent 934287b926
commit a427a53a30
1 changed files with 13 additions and 6 deletions

View File

@ -64,14 +64,22 @@ cast(Msg) -> gen_server:cast(?SERVER, Msg).
%% @doc Run a command %% @doc Run a command
-spec(run([string()]) -> any()). -spec(run([string()]) -> any()).
run([]) -> usage(); run([]) -> usage(), ok;
run(["help"]) -> usage(); run(["help"]) -> usage(), ok;
run([CmdS|Args]) -> run([CmdS|Args]) ->
case lookup(list_to_atom(CmdS)) of case lookup(list_to_atom(CmdS)) of
[{Mod, Fun}] -> Mod:Fun(Args), ok; [{Mod, Fun}] ->
[] -> usage() try Mod:Fun(Args) of
_ -> ok
catch
_:Reason ->
{error, Reason}
end;
[] ->
usage(),
{error, cmd_not_found}
end. end.
%% @doc Lookup a command %% @doc Lookup a command
@ -86,8 +94,7 @@ lookup(Cmd) ->
usage() -> usage() ->
?PRINT("Usage: ~s~n", [?MODULE]), ?PRINT("Usage: ~s~n", [?MODULE]),
[begin ?PRINT("~80..-s~n", [""]), Mod:Cmd(usage) end [begin ?PRINT("~80..-s~n", [""]), Mod:Cmd(usage) end
|| {_, {Mod, Cmd}, _} <- ets:tab2list(?CMD_TAB)], || {_, {Mod, Cmd}, _} <- ets:tab2list(?CMD_TAB)].
ok.
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
%% gen_server callbacks %% gen_server callbacks