summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2013-08-01 11:54:21 +0100
committerSimon MacMullen <simon@rabbitmq.com>2013-08-01 11:54:21 +0100
commit99945fabb97d40f240bda8623092e58dec3519f3 (patch)
tree21f0523e801161ffa21136abbaa727cbce87e184
parent28b7430489dce992c935a04d51b8b87f6a0e3538 (diff)
parent7bce0bd7107360be54836af144b147e069d09a2a (diff)
downloadrabbitmq-server-99945fabb97d40f240bda8623092e58dec3519f3.tar.gz
Merge bug25594
-rw-r--r--src/rabbit.erl3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index 3724c32e..2baec885 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -476,6 +476,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],