summaryrefslogtreecommitdiff
path: root/src/rabbit.erl
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2010-04-26 21:05:43 +0100
committerMatthias Radestock <matthias@lshift.net>2010-04-26 21:05:43 +0100
commit55affbfec85f44b69c40cae59b2779771231cabb (patch)
tree976af0d2a2006114ea3768eeaf42233bb18812eb /src/rabbit.erl
parentb26c4c39b25751f9126e97cce9dd59380912cc67 (diff)
parentc8c21956bfe685eb9f9b57b955c2ce91d86b4d71 (diff)
downloadrabbitmq-server-55affbfec85f44b69c40cae59b2779771231cabb.tar.gz
merge default into bug22616
Diffstat (limited to 'src/rabbit.erl')
-rw-r--r--src/rabbit.erl7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index f2dce303..584a33ab 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -91,6 +91,13 @@
{requires, kernel_ready},
{enables, core_initialized}]}).
+-rabbit_boot_step({rabbit_memory_monitor,
+ [{description, "memory moniter"},
+ {mfa, {rabbit_sup, start_restartable_child,
+ [rabbit_memory_monitor]}},
+ {requires, rabbit_alarm},
+ {enables, core_initialized}]}).
+
-rabbit_boot_step({guid_generator,
[{description, "guid generator"},
{mfa, {rabbit_sup, start_restartable_child,