diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2010-11-16 11:45:19 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2010-11-16 11:45:19 +0000 |
| commit | 6494e66c5c7bc34a020fa63264793643a177cd06 (patch) | |
| tree | f0794ee33b395ef198d2134b1c7ec3b37fcee803 | |
| parent | 2330e5e058ac4d26552af09fee397e6b6228ec38 (diff) | |
| parent | ebf653fcbc58990f18ebb1f26d0f0e661b0fd513 (diff) | |
| download | rabbitmq-server-git-6494e66c5c7bc34a020fa63264793643a177cd06.tar.gz | |
Merge bug23498 heads
| -rw-r--r-- | src/rabbit.erl | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index a5713106e7..61a3a53dbc 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -291,11 +291,10 @@ run_boot_step({StepName, Attributes}) -> io:format("-- ~s~n", [Description]); MFAs -> io:format("starting ~-60s ...", [Description]), - [case catch apply(M,F,A) of - {'EXIT', Reason} -> - boot_error("FAILED~nReason: ~p~n", [Reason]); - ok -> - ok + [try + apply(M,F,A) + catch + _:Reason -> boot_error("FAILED~nReason: ~p~n", [Reason]) end || {M,F,A} <- MFAs], io:format("done~n"), ok |