diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-03-01 15:09:37 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-03-01 15:09:37 +0000 |
| commit | 3b9468c6c3f8e09e4843ed01c7f44edd3dcc5ff0 (patch) | |
| tree | db12787bb9be514a00862efcd8ef232277ab3f27 | |
| parent | b48e9c20a654ca202fb1e86e50711cffb0cb9d37 (diff) | |
| download | rabbitmq-server-3b9468c6c3f8e09e4843ed01c7f44edd3dcc5ff0.tar.gz | |
Actually be slightly more minimal about what we move.
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index f2a48ae2..1b9cea75 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -1341,16 +1341,6 @@ handle_cast(force_event_refresh, State = #q{exclusive_consumer = Exclusive}) -> handle_cast({dead_letter, {Msg, AckTag}, Reason}, State) -> dead_letter_msg(Msg, AckTag, Reason, State). -handle_info({'DOWN', _MonitorRef, process, DownPid, _Reason}, - State = #q{q = #amqqueue{exclusive_owner = DownPid}}) -> - %% Exclusively owned queues must disappear with their owner. In - %% the case of clean shutdown we delete the queue synchronously in - %% the reader - although not required by the spec this seems to - %% match what people expect (see bug 21824). However we need this - %% monitor-and-async- delete in case the connection goes away - %% unexpectedly. - stop_later(normal, State); - handle_info({'DOWN', _MonitorRef, process, DownPid, Reason}, State) -> case handle_ch_down(DownPid, State) of {ok, State1} -> handle_queue_down(DownPid, Reason, State1); @@ -1376,6 +1366,16 @@ handle_info(emit_stats, State) -> assert_invariant(State1), {noreply, State1, hibernate}; +handle_info({'DOWN', _MonitorRef, process, DownPid, _Reason}, + State = #q{q = #amqqueue{exclusive_owner = DownPid}}) -> + %% Exclusively owned queues must disappear with their owner. In + %% the case of clean shutdown we delete the queue synchronously in + %% the reader - although not required by the spec this seems to + %% match what people expect (see bug 21824). However we need this + %% monitor-and-async- delete in case the connection goes away + %% unexpectedly. + stop_later(normal, State); + handle_info(update_ram_duration, State = #q{backing_queue = BQ, backing_queue_state = BQS}) -> {RamDuration, BQS1} = BQ:ram_duration(BQS), |