Merge bug25044 (fa1429850857)

2 files changed, 19 insertions, 19 deletions

diff --git a/src/rabbit.erl b/src/rabbit.erl
index 73399c03..55736b28 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()},
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index 160512a2..e74211af 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -544,14 +544,17 @@ check_name(_Kind, NameBin) ->
 queue_blocked(QPid, State = #ch{blocking = Blocking}) ->
     case sets:is_element(QPid, Blocking) of
         false -> State;
-        true  -> Blocking1 = sets:del_element(QPid, Blocking),
-                 case sets:size(Blocking1) of
-                     0 -> ok = send(#'channel.flow_ok'{active = false}, State);
-                     _ -> ok
-                 end,
-                 State#ch{blocking = Blocking1}
+        true  -> maybe_send_flow_ok(
+                   State#ch{blocking = sets:del_element(QPid, Blocking)})
     end.
 
+maybe_send_flow_ok(State = #ch{blocking = Blocking}) ->
+    case sets:size(Blocking) of
+        0 -> ok = send(#'channel.flow_ok'{active = false}, State);
+        _ -> ok
+    end,
+    State.
+
 record_confirms([], State) ->
     State;
 record_confirms(MXs, State = #ch{confirmed = C}) ->
@@ -1082,12 +1085,9 @@ handle_method(#'channel.flow'{active = false}, _,
                end,
     State1 = State#ch{limiter = Limiter1},
     ok = rabbit_limiter:block(Limiter1),
-    case consumer_queues(Consumers) of
-        []    -> {reply, #'channel.flow_ok'{active = false}, State1};
-        QPids -> State2 = State1#ch{blocking = sets:from_list(QPids)},
-                 ok = rabbit_amqqueue:flush_all(QPids, self()),
-                 {noreply, State2}
-    end;
+    QPids = consumer_queues(Consumers),
+    ok = rabbit_amqqueue:flush_all(QPids, self()),
+    {noreply, maybe_send_flow_ok(State1#ch{blocking = sets:from_list(QPids)})};
 
 handle_method(_MethodRecord, _Content, _State) ->
     rabbit_misc:protocol_error(