diff options
| author | Tim Fox <tim@rabbitmq.com> | 2011-02-11 17:46:30 +0000 |
|---|---|---|
| committer | Tim Fox <tim@rabbitmq.com> | 2011-02-11 17:46:30 +0000 |
| commit | 7ebe7c1d44053228c44fcad003ec90c1bd7b8eab (patch) | |
| tree | 725e7412b1ec486d3db68307ed54e6d4042a1005 | |
| parent | cd012caed4385b393ad612aabc12107419e13e15 (diff) | |
| download | rabbitmq-server-bug23609.tar.gz | |
moved call for call deletion notification into Funbug23609
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 496b2064..5788e7b3 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -122,6 +122,8 @@ terminate({shutdown, _}, State = #q{backing_queue = BQ}) -> terminate(_Reason, State = #q{backing_queue = BQ}) -> %% FIXME: How do we cancel active subscriptions? terminate_shutdown(fun (BQS) -> + rabbit_event:notify( + queue_deleted, [{pid, self()}]), BQS1 = BQ:delete_and_terminate(BQS), %% don't care if the internal delete %% doesn't return 'ok'. @@ -186,7 +188,6 @@ terminate_shutdown(Fun, State) -> end, BQS, all_ch_record()), [emit_consumer_deleted(Ch, CTag) || {Ch, CTag, _} <- consumers(State1)], - rabbit_event:notify(queue_deleted, [{pid, self()}]), State1#q{backing_queue_state = Fun(BQS1)} end. |