summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Fedotov <hairyhum@gmail.com>2018-03-14 12:25:41 +0000
committerMichael Klishin <michael@clojurewerkz.org>2018-03-15 21:55:17 +0300
commite06da65ff3f25ad622fcf777b0a8a146d2bcddbd (patch)
tree53e295d669c635edbd0f4de34aadcd6123a622ea
parent97db801ae37b610b69c232e2333daa3f6ce75b61 (diff)
downloadrabbitmq-server-git-e06da65ff3f25ad622fcf777b0a8a146d2bcddbd.tar.gz
Make error message when refusing to delete non-empty message less radical.
(cherry picked from commit a82bdadc031bab0f607e5182a5b7325107386202)
-rw-r--r--src/rabbit_amqqueue.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl
index a0b49c4812..ec3bb9f024 100644
--- a/src/rabbit_amqqueue.erl
+++ b/src/rabbit_amqqueue.erl
@@ -844,13 +844,13 @@ delete(Q, IfUnused, IfEmpty, ActingUser) ->
case IfEmpty of
true ->
rabbit_log:error("Queue ~s on vhost ~s master node is down. "
- "Unable to check if the queue is empty. "
- "Delete failed",
+ "The queue may be not empty. "
+ "Refusing to force-delete.",
[Name, Vhost]),
{error, not_empty};
false ->
rabbit_log:warning("Queue ~s on vhost ~s master node is down. "
- "Force-deleting the queue",
+ "Force-deleting the queue.",
[Name, Vhost]),
delete_crashed_internal(Q1, ActingUser),
{ok, 0}