summaryrefslogtreecommitdiff
path: root/src/rabbit.erl
diff options
context:
space:
mode:
authorEmile Joubert <emile@rabbitmq.com>2013-02-12 11:39:47 +0000
committerEmile Joubert <emile@rabbitmq.com>2013-02-12 11:39:47 +0000
commit0b2f9fe9775bb04bfdde3d6cabf0cfcc5df1fd9d (patch)
treeb6ccfd25d5e9e868380c11c316a20a29be0e920b /src/rabbit.erl
parent9e10a9db2a9c1d6589e72059c3f0cc80e4d01bea (diff)
parent179256f569b4d9cb730ff0868e708d57fee9e6e8 (diff)
downloadrabbitmq-server-git-0b2f9fe9775bb04bfdde3d6cabf0cfcc5df1fd9d.tar.gz
Merge heads
Diffstat (limited to 'src/rabbit.erl')
-rw-r--r--src/rabbit.erl14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index 73399c03a3..55736b287e 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -435,8 +435,9 @@ start(normal, []) ->
case erts_version_check() of
ok ->
{ok, Vsn} = application:get_key(rabbit, vsn),
- error_logger:info_msg("Starting RabbitMQ ~s on Erlang ~s~n",
- [Vsn, erlang:system_info(otp_release)]),
+ error_logger:info_msg("Starting RabbitMQ ~s on Erlang ~s~n~s~n~s~n",
+ [Vsn, erlang:system_info(otp_release),
+ ?COPYRIGHT_MESSAGE, ?INFORMATION_MESSAGE]),
{ok, SupPid} = rabbit_sup:start_link(),
true = register(rabbit, self()),
print_banner(),
@@ -704,8 +705,7 @@ log_broker_started(Plugins) ->
error_logger:info_msg(
"Server startup complete; ~b plugins started.~n~s~n",
[length(Plugins), PluginList]),
- io:format("~n Broker running with ~p plugins.~n",
- [length(Plugins)])
+ io:format(" completed with ~p plugins.~n", [length(Plugins)])
end).
erts_version_check() ->
@@ -723,13 +723,13 @@ print_banner() ->
"~n## ## ~s"
"~n##########"
"~n###### ## Logs: ~s"
- "~n########## ~s~n",
+ "~n########## ~s"
+ "~n"
+ "~n Starting broker...",
[Product, Version, ?COPYRIGHT_MESSAGE, ?INFORMATION_MESSAGE,
log_location(kernel), log_location(sasl)]).
log_banner() ->
- error_logger:info_msg("~s ~s~n",
- [?COPYRIGHT_MESSAGE, ?INFORMATION_MESSAGE]),
Settings = [{"node", node()},
{"home dir", home_dir()},
{"config file(s)", config_files()},