summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmile Joubert <emile@rabbitmq.com>2013-09-11 13:26:19 +0100
committerEmile Joubert <emile@rabbitmq.com>2013-09-11 13:26:19 +0100
commite028894e2c90e21fc2a1260b61ddffdbb22787ea (patch)
treee930aa8c29f4177c1cdcc83acd5ab561cf4ab7d9
parent78d50a4e39c5616922c6e312924750c4e1d37e1e (diff)
parent0dc84f691a24c0fc93a8e1ed9b2c38c018966860 (diff)
downloadrabbitmq-server-e028894e2c90e21fc2a1260b61ddffdbb22787ea.tar.gz
Merged bug25745 into stable
-rw-r--r--src/rabbit_amqqueue_process.erl2
-rw-r--r--src/rabbit_connection_sup.erl5
2 files changed, 4 insertions, 3 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index e61cba02..05a14927 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -1073,7 +1073,7 @@ handle_call({init, Recover}, From,
gen_server2:reply(From, not_found),
case Recover of
new -> rabbit_log:warning(
- "Queue ~p exclusive owner went away~n",
+ "exclusive owner for ~s went away~n",
[rabbit_misc:rs(QName)]);
_ -> ok
end,
diff --git a/src/rabbit_connection_sup.erl b/src/rabbit_connection_sup.erl
index fee377e7..c1fa17aa 100644
--- a/src/rabbit_connection_sup.erl
+++ b/src/rabbit_connection_sup.erl
@@ -42,8 +42,9 @@ start_link() ->
SupPid,
{collector, {rabbit_queue_collector, start_link, []},
intrinsic, ?MAX_WAIT, worker, [rabbit_queue_collector]}),
- %% We need to get channels in the hierarchy here so they close
- %% before the reader. But for 1.0 readers we can't start the real
+ %% We need to get channels in the hierarchy here so they get shut
+ %% down after the reader, so the reader gets a chance to terminate
+ %% them cleanly. But for 1.0 readers we can't start the real
%% ch_sup_sup (because we don't know if we will be 0-9-1 or 1.0) -
%% so we add another supervisor into the hierarchy.
{ok, ChannelSup3Pid} =