summaryrefslogtreecommitdiff
path: root/src/rabbit.erl
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2011-02-28 13:33:42 +0000
committerSimon MacMullen <simon@rabbitmq.com>2011-02-28 13:33:42 +0000
commit66fedcc7952a12c7641ff614936bf96c8332e2a5 (patch)
tree05ba167f360fe6229cdbf828af31002dbf13f59d /src/rabbit.erl
parente4a29a36a9c76db9ad4620e095f660a134aa8585 (diff)
parent438c93a18a874cbf888aeb0e7766f336caccac15 (diff)
downloadrabbitmq-server-git-66fedcc7952a12c7641ff614936bf96c8332e2a5.tar.gz
Merge in default.
Diffstat (limited to 'src/rabbit.erl')
-rw-r--r--src/rabbit.erl4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index ffb6610d5d..21c1452fb0 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -38,6 +38,7 @@
-rabbit_boot_step({database,
[{mfa, {rabbit_mnesia, init, []}},
+ {requires, file_handle_cache},
{enables, external_infrastructure}]}).
-rabbit_boot_step({file_handle_cache,
@@ -215,7 +216,8 @@ stop_and_halt() ->
ok.
status() ->
- [{running_applications, application:which_applications()}] ++
+ [{pid, list_to_integer(os:getpid())},
+ {running_applications, application:which_applications()}] ++
rabbit_mnesia:status().
rotate_logs(BinarySuffix) ->