diff options
| author | Vlad Ionescu <vlad@lshift.net> | 2009-09-14 13:51:05 +0100 |
|---|---|---|
| committer | Vlad Ionescu <vlad@lshift.net> | 2009-09-14 13:51:05 +0100 |
| commit | ac7b3b581168a7fb7f37e9fe01a4bb7824e9480f (patch) | |
| tree | 7e1a7ea365e3a542fff01744ebda7d64a96e7351 | |
| parent | 672c802fbdc3127e4152c8698881bc88df6aac0c (diff) | |
| download | rabbitmq-server-ac7b3b581168a7fb7f37e9fe01a4bb7824e9480f.tar.gz | |
displaying (none) for '$none' atoms in rabbit_control; changing value for undefined usernames to '$none', not to confuse with none username
| -rw-r--r-- | src/rabbit_control.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_reader.erl | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/rabbit_control.erl b/src/rabbit_control.erl index cf20520e..3258a04b 100644 --- a/src/rabbit_control.erl +++ b/src/rabbit_control.erl @@ -330,6 +330,8 @@ format_info_item(Items, Key) -> case Info of {_, #resource{name = Name}} -> escape(Name); + {_, '$none'} -> + "(none)"; _ when Key =:= address; Key =:= peer_address andalso is_tuple(Value) -> inet_parse:ntoa(Value); _ when is_pid(Value) -> diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 69dbc008..435919b6 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -703,7 +703,7 @@ i(channels, #v1{}) -> i(user, #v1{connection = #connection{user = #user{username = Username}}}) -> Username; i(user, #v1{connection = #connection{user = none}}) -> - none; + '$none'; i(vhost, #v1{connection = #connection{vhost = VHost}}) -> VHost; i(timeout, #v1{connection = #connection{timeout_sec = Timeout}}) -> |