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

Change listenon_tokens to parse_listenon

This commit is contained in:
Gilbert Wong 2018-07-06 17:16:49 +08:00
parent 9433e563fb
commit 4aa50f0f6e
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/emqttd_app.erl
View File

@ -203,6 +203,7 @@ merge_sockopts(Options) ->
%% @doc Stop Listeners %% @doc Stop Listeners
stop_listeners() -> lists:foreach(fun stop_listener/1, emqttd:env(listeners, [])). stop_listeners() -> lists:foreach(fun stop_listener/1, emqttd:env(listeners, [])).
%% @private %% @private
stop_listener({tcp, ListenOn, _Opts}) -> stop_listener({tcp, ListenOn, _Opts}) ->
esockd:close('mqtt:tcp', ListenOn); esockd:close('mqtt:tcp', ListenOn);

13
src/emqttd_cli.erl
View File

@ -480,8 +480,7 @@ listeners([]) ->
end, esockd:listeners()); end, esockd:listeners());
listeners(["start", Proto, ListenOn]) -> listeners(["start", Proto, ListenOn]) ->
ListenOn1 = listenon_tokens(ListenOn), case emqttd_app:start_listener({list_to_atom(Proto), parse_listenon(ListenOn), []}) of
case emqttd_app:start_listener({list_to_atom(Proto), ListenOn1, []}) of
{ok, _Pid} -> {ok, _Pid} ->
io:format("Start ~s listener on ~s successfully.~n", [Proto, ListenOn]); io:format("Start ~s listener on ~s successfully.~n", [Proto, ListenOn]);
{error, Error} -> {error, Error} ->
@ -489,8 +488,7 @@ listeners(["start", Proto, ListenOn]) ->
end; end;
listeners(["restart", Proto, ListenOn]) -> listeners(["restart", Proto, ListenOn]) ->
ListenOn1 = listenon_tokens(ListenOn), case emqttd_app:restart_listener({list_to_atom(Proto), parse_listenon(ListenOn), []}) of
case emqttd_app:restart_listener({list_to_atom(Proto), ListenOn1, []}) of
{ok, _Pid} -> {ok, _Pid} ->
io:format("Restart ~s listener on ~s successfully.~n", [Proto, ListenOn]); io:format("Restart ~s listener on ~s successfully.~n", [Proto, ListenOn]);
{error, Error} -> {error, Error} ->
@ -498,8 +496,7 @@ listeners(["restart", Proto, ListenOn]) ->
end; end;
listeners(["stop", Proto, ListenOn]) -> listeners(["stop", Proto, ListenOn]) ->
ListenOn1 = listenon_tokens(ListenOn), case emqttd_app:stop_listener({list_to_atom(Proto), parse_listenon(ListenOn), []}) of
case emqttd_app:stop_listener({list_to_atom(Proto), ListenOn1, []}) of
ok -> ok ->
io:format("Stop ~s listener on ~s successfully.~n", [Proto, ListenOn]); io:format("Stop ~s listener on ~s successfully.~n", [Proto, ListenOn]);
{error, Error} -> {error, Error} ->
@ -609,8 +606,8 @@ format(_, Val) ->
bin(S) -> iolist_to_binary(S). bin(S) -> iolist_to_binary(S).
listenon_tokens(ListenOn) -> parse_listenon(ListenOn) ->
case string:tokens(ListenOn, ":") of case string:tokens(ListenOn, ":") of
[Port] -> {"0.0.0.0", 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.