summaryrefslogtreecommitdiff
path: root/src/rabbit.erl
diff options
context:
space:
mode:
authorEmile Joubert <emile@rabbitmq.com>2011-05-31 16:07:13 +0100
committerEmile Joubert <emile@rabbitmq.com>2011-05-31 16:07:13 +0100
commit39e3f17926ccc20917a7aa44ba958a7541a8f14e (patch)
tree8f8b881a35e904eca10956655887b6fe607fefa2 /src/rabbit.erl
parent2b70875cc5a34c273def6f1c62c8696c15c4acee (diff)
downloadrabbitmq-server-39e3f17926ccc20917a7aa44ba958a7541a8f14e.tar.gz
Move status info (again)
Diffstat (limited to 'src/rabbit.erl')
-rw-r--r--src/rabbit.erl12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index c239262d..88b16474 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -180,6 +180,10 @@
-spec(status/0 ::
() -> [{pid, integer()} |
{running_applications, [{atom(), string(), string()}]} |
+ {os , {atom(), atom()}} |
+ {erlang_version , string()} |
+ {memory , any()} |
+ {env , [{atom() | term()}]} |
{nodes, [{rabbit_mnesia:node_type(), [node()]}]} |
{running_nodes, [node()]}]).
-spec(log_location/1 :: ('sasl' | 'kernel') -> log_location()).
@@ -218,7 +222,13 @@ stop_and_halt() ->
status() ->
[{pid, list_to_integer(os:getpid())},
- {running_applications, application:which_applications()}] ++
+ {running_applications, application:which_applications()},
+ {os, os:type()},
+ {erlang_version, erlang:system_info(system_version)},
+ {memory, erlang:memory()},
+ {env, lists:filter(fun ({default_pass, _}) -> false;
+ (_) -> true
+ end, application:get_all_env(rabbit))}] ++
rabbit_mnesia:status().
rotate_logs(BinarySuffix) ->