summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTim Watson <tim@rabbitmq.com>2013-06-14 14:35:41 +0100
committerTim Watson <tim@rabbitmq.com>2013-06-14 14:35:41 +0100
commitf2e321591a3ef7decd7639185b7bfbe3a63866e5 (patch)
tree60d737d7b0db6f8b1cb191bef893739a21294109 /src
parent9016670328bc46e9df8ca7a9108f70f35f027629 (diff)
parentb390a52c7a576ff79b466ae7b2ffea8c95f306d4 (diff)
downloadrabbitmq-server-git-f2e321591a3ef7decd7639185b7bfbe3a63866e5.tar.gz
merge stable into default
Diffstat (limited to 'src')
-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 1de14b5ce4..22692dcbfe 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,