summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@rabbitmq.com>2011-06-02 15:25:42 +0100
committerMatthew Sackman <matthew@rabbitmq.com>2011-06-02 15:25:42 +0100
commit64fda0635880aeee08096e58ca29485311a3e1c7 (patch)
tree2d00c91fcf064c4d3579d4b74c1b4d5d62c65ba8
parent535567b4a128459c68d21c3fe13458a457d51feb (diff)
downloadrabbitmq-server-git-64fda0635880aeee08096e58ca29485311a3e1c7.tar.gz
Reduce diff from bug23554: Allow formatting of nested info items
-rw-r--r--src/rabbit_control.erl6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl
index 8172f8040c..8e0a2a535f 100644
--- a/src/rabbit_control.erl
+++ b/src/rabbit_control.erl
@@ -372,6 +372,12 @@ format_info_item([{TableEntryKey, TableEntryType, _TableEntryValue} | _] =
Value) when is_binary(TableEntryKey) andalso
is_atom(TableEntryType) ->
io_lib:format("~1000000000000p", [prettify_amqp_table(Value)]);
+format_info_item([T | _] = Value)
+ when is_tuple(T) orelse is_pid(T) orelse is_binary(T) orelse is_atom(T) orelse
+ is_list(T) ->
+ "[" ++
+ lists:nthtail(2, lists:append(
+ [", " ++ format_info_item(E) || E <- Value])) ++ "]";
format_info_item(Value) ->
io_lib:format("~w", [Value]).