diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2012-10-11 10:20:17 +0100 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2012-10-11 10:20:17 +0100 |
| commit | bbf532facbd213069b6fc88d448144f24b0cfd49 (patch) | |
| tree | 063f304009fcedb3a113f8fc144da494176a61ad | |
| parent | 60aa98ee44ad3de0a5bcd3ca21ca888d398e78ba (diff) | |
| download | rabbitmq-server-bbf532facbd213069b6fc88d448144f24b0cfd49.tar.gz | |
Tidying
| -rw-r--r-- | docs/rabbitmqctl.1.xml | 5 | ||||
| -rw-r--r-- | src/rabbit_control_main.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_tests.erl | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/docs/rabbitmqctl.1.xml b/docs/rabbitmqctl.1.xml index 564af9fd..522a51ee 100644 --- a/docs/rabbitmqctl.1.xml +++ b/docs/rabbitmqctl.1.xml @@ -899,9 +899,8 @@ <para> Policies are used to control and modify the behaviour of queues and exchanges on a cluster-wide basis. Policies apply within a - given vhost, and consist of a key and a value. The key must be a - string and the value must be a JSON string. Policies can be set, - cleared and listed. + given vhost, and consist of a key, pattern, definition and an + optional priority. Policies can be set, cleared and listed. </para> <variablelist> <varlistentry> diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl index 04304111..2d99030b 100644 --- a/src/rabbit_control_main.erl +++ b/src/rabbit_control_main.erl @@ -464,7 +464,7 @@ action(list_parameters, Node, [], Opts, Inform) -> action(set_policy, Node, [Key, Pattern, Defn | Priority], Opts, Inform) -> VHostArg = list_to_binary(proplists:get_value(?VHOST_OPT, Opts)), - Inform("Setting policy ~p to ~p for pattern ~p", [Key, Defn, Pattern]), + Inform("Setting policy ~p for pattern ~p to ~p", [Key, Pattern, Defn]), rpc_call(Node, rabbit_runtime_parameters, parse_set_policy, [VHostArg, list_to_binary(Key), Pattern, Defn] ++ Priority); diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index 9550a482..9dca1a5a 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -1494,7 +1494,6 @@ test_declare_on_dead_queue(SecondaryNode) -> %%--------------------------------------------------------------------- control_action(Command, Args) -> -rabbit_log:info("control args ~p~n", [Args]), control_action(Command, node(), Args, default_options()). control_action(Command, Args, NewOpts) -> |