diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2018-03-15 04:00:35 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2018-03-15 21:55:28 +0300 |
| commit | 0e57c034e31fe7f5ad6f05f144afa38f24a0676d (patch) | |
| tree | 39972b602bce95da3b269165168b1745125a0b02 | |
| parent | e06da65ff3f25ad622fcf777b0a8a146d2bcddbd (diff) | |
| download | rabbitmq-server-git-0e57c034e31fe7f5ad6f05f144afa38f24a0676d.tar.gz | |
Wording, compile from scratch
(cherry picked from commit b30ae2f90c27c52c4e9db5f3845d37e441c6e371)
| -rw-r--r-- | src/rabbit_amqqueue.erl | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index ec3bb9f024..b9f1ba3631 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -837,20 +837,22 @@ delete_immediately(QPids) -> delete(Q, IfUnused, IfEmpty, ActingUser) -> case wait_for_promoted_or_stopped(Q) of - {promoted, Q1 = #amqqueue{pid = QPid}} -> + {promoted, #amqqueue{pid = QPid}} -> delegate:invoke(QPid, {gen_server2, call, [{delete, IfUnused, IfEmpty, ActingUser}, infinity]}); {stopped, Q1} -> #resource{name = Name, virtual_host = Vhost} = Q1#amqqueue.name, case IfEmpty of true -> - rabbit_log:error("Queue ~s on vhost ~s master node is down. " - "The queue may be not empty. " + rabbit_log:error("Queue ~s in vhost ~s has its master node down and " + "no mirrors available or eligible for promotion. " + "The queue may be non-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.", + rabbit_log:warning("Queue ~s in vhost ~s has its master node is down and " + "no mirrors available or eligible for promotion. " + "Forcing queue deletion.", [Name, Vhost]), delete_crashed_internal(Q1, ActingUser), {ok, 0} |