summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2009-07-24 15:18:26 +0100
committerMatthias Radestock <matthias@lshift.net>2009-07-24 15:18:26 +0100
commit57e0a3be3fa973db550f917c9c88a3a2b4a22f2a (patch)
treea6d1c2d6785796dfe5216017982d878bf65bedd6 /src
parent16e27751f94f5ffa847573457db546853627dec8 (diff)
downloadrabbitmq-server-git-57e0a3be3fa973db550f917c9c88a3a2b4a22f2a.tar.gz
don't include TimeoutState in status formatting
ordinary timeouts are not shown as part of the status, so it doesn't make sense to show the special ones. Also, the code was incorrect.
Diffstat (limited to 'src')
-rw-r--r--src/gen_server2.erl13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/gen_server2.erl b/src/gen_server2.erl
index 9a57e4cd67..438f409750 100644
--- a/src/gen_server2.erl
+++ b/src/gen_server2.erl
@@ -988,9 +988,8 @@ name_to_pid(Name) ->
%% Status information
%%-----------------------------------------------------------------
format_status(Opt, StatusData) ->
- [PDict, SysState, Parent, Debug, [Name, State, Mod, _Time,
- TimeoutState, Queue]] =
- StatusData,
+ [PDict, SysState, Parent, Debug,
+ [Name, State, Mod, _Time, _TimeoutState, Queue]] = StatusData,
NameTag = if is_pid(Name) ->
pid_to_list(Name);
is_atom(Name) ->
@@ -1008,15 +1007,9 @@ format_status(Opt, StatusData) ->
_ ->
[{data, [{"State", State}]}]
end,
- Specfic1 = case TimeoutState of
- undefined -> Specfic;
- {Current, Min, undefined} ->
- [ {"Binary Timeout Current and Min", {Current, Min}}
- | Specfic]
- end,
[{header, Header},
{data, [{"Status", SysState},
{"Parent", Parent},
{"Logged events", Log},
{"Queued messages", priority_queue:to_list(Queue)}]} |
- Specfic1].
+ Specfic].