merging in from default

1 files changed, 16 insertions, 2 deletions

diff --git a/src/rabbit.erl b/src/rabbit.erl
index 29e23b6d3a..6ad22e7adb 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -133,6 +133,7 @@ start(normal, []) ->
        {"core processes",
         fun () ->
                 ok = start_child(rabbit_log),
+                ok = rabbit_hooks:start(),
 
                 ok = rabbit_amqqueue:start(),
 
@@ -222,8 +223,21 @@ log_location(Type) ->
 print_banner() ->
     {ok, Product} = application:get_key(id),
     {ok, Version} = application:get_key(vsn),
-    io:format("~s ~s (AMQP ~p-~p)~n~s~n~s~n~n",
-              [Product, Version,
+    ProductLen = string:len(Product),
+    io:format("~n"
+              "+---+   +---+~n"
+              "|   |   |   |~n"
+              "|   |   |   |~n"
+              "|   |   |   |~n"
+              "|   +---+   +-------+~n"
+              "|                   |~n"
+              "| ~s  +---+   |~n"
+              "|           |   |   |~n"
+              "| ~s  +---+   |~n"
+              "|                   |~n"
+              "+-------------------+~n"
+              "AMQP ~p-~p~n~s~n~s~n~n",
+              [Product, string:right([$v|Version], ProductLen),
                ?PROTOCOL_VERSION_MAJOR, ?PROTOCOL_VERSION_MINOR,
                ?COPYRIGHT_MESSAGE, ?INFORMATION_MESSAGE]),
     Settings = [{"node",         node()},