summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2009-10-22 18:59:40 +0100
committerMatthias Radestock <matthias@lshift.net>2009-10-22 18:59:40 +0100
commit26808970e5d49382ce7a47ad1046a560c72196e9 (patch)
tree93f2596923feb5f7ffc3a93f36799091a5617d78
parent4c06bbb01bf055e7e5d719c1a084fe088a6f648b (diff)
downloadrabbitmq-server-bug21807.tar.gz
correct list_bindings result field orderbug21807
-rw-r--r--docs/rabbitmqctl.1.pod2
-rw-r--r--src/rabbit_control.erl4
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/rabbitmqctl.1.pod b/docs/rabbitmqctl.1.pod
index c43ed2ea..6b420872 100644
--- a/docs/rabbitmqctl.1.pod
+++ b/docs/rabbitmqctl.1.pod
@@ -279,7 +279,7 @@ exchange arguments
=item list_bindings [-p I<vhostpath>]
List bindings by virtual host. Each line printed describes a binding,
-with the exchange name, routing key, queue name and arguments,
+with the exchange name, queue name, routing key and arguments,
separated by tab characters.
=item list_connections [I<connectioninfoitem> ...]
diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl
index cc82e727..19579729 100644
--- a/src/rabbit_control.erl
+++ b/src/rabbit_control.erl
@@ -181,7 +181,7 @@ messages, acks_uncommitted, consumers, transactions, memory]. The default is
auto_delete, arguments]. The default is to display name and type.
The output format for \"list_bindings\" is a list of rows containing
-exchange name, routing key, queue name and arguments, in that order.
+exchange name, queue name, routing key and arguments, in that order.
<ConnectionInfoItem> must be a member of the list [node, address, port,
peer_address, peer_port, state, channels, user, vhost, timeout, frame_max,
@@ -285,7 +285,7 @@ action(list_exchanges, Node, Args, Inform) ->
action(list_bindings, Node, Args, Inform) ->
Inform("Listing bindings", []),
{VHostArg, _} = parse_vhost_flag_bin(Args),
- InfoKeys = [exchange_name, routing_key, queue_name, args],
+ InfoKeys = [exchange_name, queue_name, routing_key, args],
display_info_list(
[lists:zip(InfoKeys, tuple_to_list(X)) ||
X <- rpc_call(Node, rabbit_exchange, list_bindings, [VHostArg])],