summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Watson <tim@rabbitmq.com>2013-06-14 14:33:44 +0100
committerTim Watson <tim@rabbitmq.com>2013-06-14 14:33:44 +0100
commitb0ac434e4b3f06c555f2b9f737152178b3b7b95d (patch)
treea2a472d952f0c0bdcf9962ab34f104655330b93e
parent7f8ff8a3308d5f545a464b3a5f4e163cd9636330 (diff)
parent8cbcb07661c6bd83ec685977df85479bd2d24ee6 (diff)
downloadrabbitmq-server-b0ac434e4b3f06c555f2b9f737152178b3b7b95d.tar.gz
merge bug25600 into stable
-rw-r--r--src/rabbit_channel.erl8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index 1de14b5c..22692dcb 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -1198,7 +1198,8 @@ handle_publishing_queue_down(QPid, Reason, State = #ch{unconfirmed = UC}) ->
handle_consuming_queue_down(QPid,
State = #ch{consumer_mapping = ConsumerMapping,
- queue_consumers = QCons}) ->
+ queue_consumers = QCons,
+ queue_names = QNames}) ->
ConsumerTags = case dict:find(QPid, QCons) of
error -> gb_sets:new();
{ok, CTags} -> CTags
@@ -1208,6 +1209,11 @@ handle_consuming_queue_down(QPid,
ok = send(#'basic.cancel'{consumer_tag = CTag,
nowait = true},
State),
+ rabbit_event:notify(
+ consumer_deleted,
+ [{consumer_tag, CTag},
+ {channel, self()},
+ {queue, dict:fetch(QPid, QNames)}]),
dict:erase(CTag, CMap)
end, ConsumerMapping, ConsumerTags),
State#ch{consumer_mapping = ConsumerMapping1,