diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-03-26 18:25:34 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-03-26 18:25:34 +0100 |
| commit | 6ba99d5beaec247be531f03985f5226b2ee0cef6 (patch) | |
| tree | a85dd6f700e58af5b83c3e0d7c6da4786dd9f372 /src | |
| parent | 780a31e3dd4c911a62d9887b0f32840462de92bc (diff) | |
| download | rabbitmq-server-git-6ba99d5beaec247be531f03985f5226b2ee0cef6.tar.gz | |
Rearrange for mgmt.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_control.erl | 5 | ||||
| -rw-r--r-- | src/rabbit_misc.erl | 5 | ||||
| -rw-r--r-- | src/rabbit_runtime_parameters.erl | 11 |
3 files changed, 15 insertions, 6 deletions
diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl index 7ce2baebf9..ec514fbf1d 100644 --- a/src/rabbit_control.erl +++ b/src/rabbit_control.erl @@ -280,8 +280,9 @@ action(clear_parameter, Node, [AppName, Key], _Opts, Inform) -> action(list_runtime_parameters, Node, Args = [], _Opts, Inform) -> Inform("Listing runtime parameters", []), - display_info_list(rpc_call(Node, rabbit_runtime_parameters, list, Args), - rabbit_runtime_parameters:info_keys()); + display_info_list( + rpc_call(Node, rabbit_runtime_parameters, list_formatted, Args), + rabbit_runtime_parameters:info_keys()); action(list_queues, Node, Args, Opts, Inform) -> Inform("Listing queues", []), diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl index ddf7f57453..ca40ba114a 100644 --- a/src/rabbit_misc.erl +++ b/src/rabbit_misc.erl @@ -55,7 +55,7 @@ -export([const_ok/0, const/1]). -export([ntoa/1, ntoab/1]). -export([is_process_alive/1]). --export([pget/2, pget/3, pget_or_die/2]). +-export([pget/2, pget/3, pget_or_die/2, pset/3]). -export([format_message_queue/2]). -export([append_rpc_all_nodes/4]). -export([multi_call/2]). @@ -199,6 +199,7 @@ -spec(pget/2 :: (term(), [term()]) -> term()). -spec(pget/3 :: (term(), [term()], term()) -> term()). -spec(pget_or_die/2 :: (term(), [term()]) -> term() | no_return()). +-spec(pset/3 :: (term(), term(), [term()]) -> term()). -spec(format_message_queue/2 :: (any(), priority_queue:q()) -> term()). -spec(append_rpc_all_nodes/4 :: ([node()], atom(), atom(), [any()]) -> [any()]). -spec(multi_call/2 :: @@ -855,6 +856,8 @@ pget_or_die(K, P) -> V -> V end. +pset(Key, Value, List) -> [{Key, Value} | proplists:delete(Key, List)]. + format_message_queue(_Opt, MQ) -> Len = priority_queue:len(MQ), {Len, diff --git a/src/rabbit_runtime_parameters.erl b/src/rabbit_runtime_parameters.erl index 47843552db..1ba38ec85a 100644 --- a/src/rabbit_runtime_parameters.erl +++ b/src/rabbit_runtime_parameters.erl @@ -18,7 +18,9 @@ -include("rabbit.hrl"). --export([set/3, clear/2, list/0, lookup/3, info_keys/0]). +-export([set/3, clear/2, list/0, list_formatted/0, lookup/3, info_keys/0]). + +-import(rabbit_misc, [pget/2, pset/3]). -define(TABLE, rabbit_runtime_parameters). @@ -46,8 +48,11 @@ list() -> All = rabbit_misc:dirty_read_all(?TABLE), [[{app_name, AppName}, {key, Key}, - {value, format(Value)}] || #runtime_parameters{key = {AppName, Key}, - value = Value} <- All]. + {value, Value}] || #runtime_parameters{key = {AppName, Key}, + value = Value} <- All]. + +list_formatted() -> + [pset(value, format(pget(value, P)), P) || P <- list()]. lookup(AppName, Key, Default) -> case mnesia:dirty_read(?TABLE, {AppName, Key}) of |