diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-03-11 16:31:29 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-03-11 16:31:29 +0000 |
| commit | eb32f905251b50dfeefc2b720e25f8daebcbedef (patch) | |
| tree | ec25c7df675d5eb118b79a36686359c8284af484 | |
| parent | 7df4645efca85bb3f04b5586eef37d9ea3a4579d (diff) | |
| download | rabbitmq-server-git-eb32f905251b50dfeefc2b720e25f8daebcbedef.tar.gz | |
Add listeners to rabbitmqctl status.
| -rw-r--r-- | src/rabbit.erl | 11 | ||||
| -rw-r--r-- | src/rabbit_networking.erl | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index bd4f1dbc88..ad779ab444 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -394,7 +394,8 @@ status() -> {os, os:type()}, {erlang_version, erlang:system_info(system_version)}, {memory, rabbit_vm:memory()}, - {alarms, alarms()}], + {alarms, alarms()}, + {listeners, listeners()}], S2 = rabbit_misc:filter_exit_map( fun ({Key, {M, F, A}}) -> {Key, erlang:apply(M, F, A)} end, [{vm_memory_high_watermark, {vm_memory_monitor, @@ -424,6 +425,14 @@ alarms() -> %% [{{resource_limit,memory,rabbit@mercurio},[]}] [Limit || {{resource_limit, Limit, Node}, _} <- Alarms, Node =:= N]. +listeners() -> + [{Protocol, Port, rabbit_misc:ntoa(IP)} || + #listener{node = Node, + protocol = Protocol, + ip_address = IP, + port = Port} <- rabbit_networking:active_listeners(), + Node =:= node()]. + is_running() -> is_running(node()). is_running(Node) -> rabbit_nodes:is_process_running(Node, rabbit). diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl index 112b737562..4f92ffe923 100644 --- a/src/rabbit_networking.erl +++ b/src/rabbit_networking.erl @@ -280,7 +280,7 @@ record_distribution_listener() -> {ok, Names} = net_adm:names(), {Name, _} = rabbit_nodes:parts(node()), [Port] = [P || {N, P} <- Names, N =:= Name], - tcp_listener_started('erlang-clustering', {0,0,0,0,0,0,0,0}, Port). + tcp_listener_started(clustering, {0,0,0,0,0,0,0,0}, Port). active_listeners() -> rabbit_misc:dirty_read_all(rabbit_listener). |