diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2010-12-03 16:16:59 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2010-12-03 16:16:59 +0000 |
| commit | f459b1b44e136f5f51f1a20a1157756f3b6b1557 (patch) | |
| tree | da11c55972a84561b51ffffb34b571768c25082e | |
| parent | a2916703e28940f0d2d44d8aa43d6ac51605a391 (diff) | |
| download | rabbitmq-server-bug23232.tar.gz | |
Fixbug23232
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 2ea4de9f..b491f4f1 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -203,7 +203,7 @@ terminate_shutdown(Fun, State) -> BQ:tx_rollback(Txn, BQSN), BQSN1 end, BQS, all_ch_record()), - [emit_consumer_deleted(CTag, Ch) + [emit_consumer_deleted(Ch, CTag) || {CTag, Ch, _} <- consumers(State1)], rabbit_event:notify(queue_deleted, [{pid, self()}]), State1#q{backing_queue_state = Fun(BQS1)} @@ -543,7 +543,7 @@ remove_consumer(ChPid, ConsumerTag, Queue) -> remove_consumers(ChPid, Queue) -> {Kept, Removed} = split_by_channel(ChPid, Queue), - [emit_consumer_deleted(CTag, Ch) || + [emit_consumer_deleted(Ch, CTag) || {Ch, #consumer{tag = CTag}} <- queue:to_list(Removed)], Kept. @@ -951,7 +951,7 @@ handle_call({basic_cancel, ChPid, ConsumerTag, OkMsg}, _From, C1#cr{limiter_pid = undefined}; _ -> C1 end), - emit_consumer_deleted(ConsumerTag, ChPid), + emit_consumer_deleted(ChPid, ConsumerTag), ok = maybe_send_reply(ChPid, OkMsg), NewState = State#q{exclusive_consumer = cancel_holder(ChPid, |