Better dispatching while formatting results in rabbitmqctl

1 files changed, 3 insertions, 4 deletions

diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl
index 419d71d9..1e07f6d2 100644
--- a/src/rabbit_control.erl
+++ b/src/rabbit_control.erl
@@ -310,10 +310,9 @@ format_info_item(Items, Key) ->
     case Info of
         {_, #resource{name = Name}} ->
             url_encode(Name);
-        {Key, IpAddress} when Key =:= address; Key =:= peer_address
-                              andalso is_tuple(IpAddress) ->
-            inet_parse:ntoa(IpAddress);
-        {pid, _} ->
+        _ when Key =:= address; Key =:= peer_address andalso is_tuple(Value) ->
+            inet_parse:ntoa(Value);
+        _ when is_pid(Value) ->
             atom_to_list(node(Value));
         _ when is_binary(Value) -> 
             url_encode(Value);