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
commit4b7c1cfb1b04e5d3a3d3e59b9879f7dd942acd46 (patch)
tree21f0523e801161ffa21136abbaa727cbce87e184
parentb11b7b056212d4a018da11c0ac1a53ef840a7153 (diff)
parent4678195575732473c9b607e2b858653d968bd42e (diff)
downloadrabbitmq-server-git-4b7c1cfb1b04e5d3a3d3e59b9879f7dd942acd46.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 3724c32e29..2baec885c3 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],