summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2013-08-01 11:45:28 +0100
committerSimon MacMullen <simon@rabbitmq.com>2013-08-01 11:45:28 +0100
commit7bce0bd7107360be54836af144b147e069d09a2a (patch)
treead25a4aa734e0bbf4a5bf3fafa971f5c365d2022
parentb5e877790f7d332b3f09e9b3b1e3c64b102fcd44 (diff)
parent0896ef6263ff2ed5d75890e1fee0a39daed2269a (diff)
downloadrabbitmq-server-7bce0bd7107360be54836af144b147e069d09a2a.tar.gz
Merge bug25693
-rw-r--r--src/rabbit.erl3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index eae3b802..17426cfc 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -472,6 +472,9 @@ run_boot_step({_StepName, Attributes}) ->
MFAs ->
[try
apply(M,F,A)
+ of
+ ok -> ok;
+ {error, Reason} -> boot_error(Reason, not_available)
catch
_:Reason -> boot_error(Reason, erlang:get_stacktrace())
end || {M,F,A} <- MFAs],