summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2011-08-11 13:37:00 +0100
committerSimon MacMullen <simon@rabbitmq.com>2011-08-11 13:37:00 +0100
commit68f1110e4ab5771bd41718161ae6bbb7778deb93 (patch)
tree13578b81fe0c7919dd070055006431a0fe594feb
parent20985917da9b2c654c78a4e443224a24db13bd12 (diff)
downloadrabbitmq-server-git-68f1110e4ab5771bd41718161ae6bbb7778deb93.tar.gz
Report the name when a queue is deleted.
-rw-r--r--src/rabbit_amqqueue_process.erl6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index e105b621d8..86daa1552f 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -151,11 +151,13 @@ terminate(shutdown = R, State = #q{backing_queue = BQ}) ->
terminate_shutdown(fun (BQS) -> BQ:terminate(R, BQS) end, State);
terminate({shutdown, _} = R, State = #q{backing_queue = BQ}) ->
terminate_shutdown(fun (BQS) -> BQ:terminate(R, BQS) end, State);
-terminate(Reason, State = #q{backing_queue = BQ}) ->
+terminate(Reason, State = #q{q = #amqqueue{name = QName},
+ backing_queue = BQ}) ->
%% FIXME: How do we cancel active subscriptions?
terminate_shutdown(fun (BQS) ->
rabbit_event:notify(
- queue_deleted, [{pid, self()}]),
+ queue_deleted, [{pid, self()},
+ {name, QName}]),
BQS1 = BQ:delete_and_terminate(Reason, BQS),
%% don't care if the internal delete
%% doesn't return 'ok'.