diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2012-02-02 16:09:56 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2012-02-02 16:09:56 +0000 |
| commit | 0021a3fd306f5bcd39e2ed5be02c551956cce9e0 (patch) | |
| tree | c340b096dce3c70e4783801ae8e1dfdfd8970026 /src/rabbit.erl | |
| parent | 22e541e4a464842d4be32396185e50b42c68aba6 (diff) | |
| parent | bd2902fc29d4508f40197a46551bc2590e03c1de (diff) | |
| download | rabbitmq-server-git-0021a3fd306f5bcd39e2ed5be02c551956cce9e0.tar.gz | |
merge default into bug24624 and use new rabbit_misc:format/2
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 23e258d3ee..2e344bd84b 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -506,8 +506,9 @@ boot_step_error({error, {timeout_waiting_for_tables, _}}, _Stacktrace) -> " shut down forcefully~nit cannot determine which nodes" " are timing out. Details on all nodes will~nfollow.~n", rabbit_mnesia:all_clustered_nodes() -- [node()]}; - Ns -> {format("Timeout contacting cluster nodes: ~p.~n", - [Ns]), Ns} + Ns -> {rabbit_misc:format( + "Timeout contacting cluster nodes: ~p.~n", [Ns]), + Ns} end, boot_error(Err ++ rabbit_nodes:diagnostics(Nodes) ++ "~n~n", []); @@ -523,8 +524,6 @@ boot_error(Format, Args) -> timer:sleep(1000), exit({?MODULE, failure_during_boot}). -format(F, A) -> lists:flatten(io_lib:format(F, A)). - %%--------------------------------------------------------------------------- %% boot step functions |