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

Merge branch 'develop' of https://github.com/emqtt/emqttd into develop

This commit is contained in:
HuangDan 2017-07-06 17:53:31 +08:00
parent e675959d57 87d2a7ca85
commit 55b77af044
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/emqttd_cli.erl
View File

@ -475,38 +475,38 @@ listeners([]) ->
end, Info) end, Info)
end, esockd:listeners()); end, esockd:listeners());
listeners(["reopen", Proto, ListenOn1]) -> listeners(["restart", Proto, ListenOn]) ->
ListenOn = case string:tokens(ListenOn1, ":") of ListenOn1 = case string:tokens(ListenOn, ":") of
[Port] -> list_to_integer(Port); [Port] -> list_to_integer(Port);
[IP, Port] -> {IP, list_to_integer(Port)} [IP, Port] -> {IP, list_to_integer(Port)}
end, end,
case emqttd_app:restart_listener({list_to_atom(Proto), ListenOn, []}) of case emqttd_app:restart_listener({list_to_atom(Proto), ListenOn1, []}) of
{ok, _Pid} -> {ok, _Pid} ->
io:format("Reopen ~p listen on ~p successfully.~n", io:format("Restart ~s listen on ~s successfully.~n",
[list_to_atom(Proto), list_to_atom(ListenOn1)]); [list_to_atom(Proto), list_to_atom(ListenOn)]);
{error, Error} -> {error, Error} ->
io:format("Failed to reopen ~p listen on ~p, error:~p~n", io:format("Failed to restart ~s listen on ~s, error:~p~n",
[list_to_atom(Proto), list_to_atom(ListenOn1) ,Error]) [list_to_atom(Proto), list_to_atom(ListenOn) ,Error])
end; end;
listeners(["close", Proto, ListenOn1]) -> listeners(["stop", Proto, ListenOn]) ->
ListenOn = case string:tokens(ListenOn1, ":") of ListenOn1 = case string:tokens(ListenOn, ":") of
[Port] -> list_to_integer(Port); [Port] -> list_to_integer(Port);
[IP, Port] -> {IP, list_to_integer(Port)} [IP, Port] -> {IP, list_to_integer(Port)}
end, end,
case emqttd_app:stop_listener({list_to_atom(Proto), ListenOn, []}) of case emqttd_app:stop_listener({list_to_atom(Proto), ListenOn1, []}) of
ok -> ok ->
io:format("Close ~p on ~p successfully.~n", io:format("Stop ~s on ~s successfully.~n",
[list_to_atom(Proto), list_to_atom(ListenOn1)]); [list_to_atom(Proto), list_to_atom(ListenOn)]);
{error, Error} -> {error, Error} ->
io:format("Failed to close ~p on ~p, error:~p~n", io:format("Failed to stop ~s on ~s, error:~p~n",
[list_to_atom(Proto), list_to_atom(ListenOn1) ,Error]) [list_to_atom(Proto), list_to_atom(ListenOn) ,Error])
end; end;
listeners(_) -> listeners(_) ->
?USAGE([{"listeners", "List listeners"}, ?USAGE([{"listeners", "List listeners"},
{"listeners reopen <Proto> <Port>", "Reopen a listener port"}, {"listeners restart <Proto> <Port>", "Restart a listener port"},
{"listeners close <Proto> <Port>", "Close a listener port"}]). {"listeners stop <Proto> <Port>", "Stop a listener port"}]).
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
%% Dump ETS %% Dump ETS