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

Merge pull request #810 from emqtt/emq20 

Print shared subscriptions
This commit is contained in:
Feng Lee 2016-12-09 16:48:40 +08:00 committed by GitHub
parent 4399a5d641 fa99cdcaa5
commit 47a8a6ed53
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/emqttd_cli.erl
View File

@ -195,7 +195,8 @@ sessions(_) ->
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
%% @doc Routes Command %% @doc Routes Command
routes(["list"]) -> routes(["list"]) ->
if_could_print(mqtt_route, fun print/1); Routes = emqttd_router:dump(),
foreach(fun print/1, Routes);
routes(["show", Topic]) -> routes(["show", Topic]) ->
print(mnesia:dirty_read(mqtt_route, bin(Topic))); print(mnesia:dirty_read(mqtt_route, bin(Topic)));
@ -506,9 +507,14 @@ print(#mqtt_client{client_id = ClientId, clean_sess = CleanSess, username = User
%% print(#mqtt_topic{topic = Topic, flags = Flags}) -> %% print(#mqtt_topic{topic = Topic, flags = Flags}) ->
%% ?PRINT("~s: ~s~n", [Topic, string:join([atom_to_list(F) || F <- Flags], ",")]); %% ?PRINT("~s: ~s~n", [Topic, string:join([atom_to_list(F) || F <- Flags], ",")]);
print({route, Routes}) ->
foreach(fun print/1, Routes);
print({local_route, Routes}) ->
foreach(fun print/1, Routes);
print(#mqtt_route{topic = Topic, node = Node}) -> print(#mqtt_route{topic = Topic, node = Node}) ->
?PRINT("~s -> ~s~n", [Topic, Node]); ?PRINT("~s -> ~s~n", [Topic, Node]);
print({Topic, Node}) ->
?PRINT("~s -> ~s~n", [Topic, Node]);
print({ClientId, _ClientPid, _Persistent, SessInfo}) -> print({ClientId, _ClientPid, _Persistent, SessInfo}) ->
InfoKeys = [clean_sess, InfoKeys = [clean_sess,
@ -528,6 +534,10 @@ print({ClientId, _ClientPid, _Persistent, SessInfo}) ->
print(subscription, {Sub, Topic}) when is_pid(Sub) -> print(subscription, {Sub, Topic}) when is_pid(Sub) ->
?PRINT("~p -> ~s~n", [Sub, Topic]); ?PRINT("~p -> ~s~n", [Sub, Topic]);
print(subscription, {Sub, {_Share, Topic}}) when is_pid(Sub) ->
?PRINT("~p -> ~s~n", [Sub, Topic]);
print(subscription, {Sub, {_Share, Topic}}) ->
?PRINT("~s -> ~s~n", [Sub, Topic]);
print(subscription, {Sub, Topic}) -> print(subscription, {Sub, Topic}) ->
?PRINT("~s -> ~s~n", [Sub, Topic]). ?PRINT("~s -> ~s~n", [Sub, Topic]).