diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-09-05 10:41:13 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-09-05 10:41:13 +0100 |
| commit | 1b0b6a904b2071582e4745c6cd621cda8427763f (patch) | |
| tree | f8fbb7bf95a3ef7bb7789b8d51078a1ca9a79895 | |
| parent | 7d58dbfd96c6a5b87e7a5a3520106dacbf365254 (diff) | |
| download | rabbitmq-server-1b0b6a904b2071582e4745c6cd621cda8427763f.tar.gz | |
Gah
| -rw-r--r-- | src/rabbit_mirror_queue_master.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_mirror_queue_slave.erl | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/rabbit_mirror_queue_master.erl b/src/rabbit_mirror_queue_master.erl index 473d9671..8b71060c 100644 --- a/src/rabbit_mirror_queue_master.erl +++ b/src/rabbit_mirror_queue_master.erl @@ -117,8 +117,7 @@ stop_mirroring(State = #state { coordinator = CPid, {BQ, BQS}. terminate({shutdown, dropped} = Reason, - State = #state { gm = GM, - backing_queue = BQ, + State = #state { backing_queue = BQ, backing_queue_state = BQS }) -> %% Backing queue termination - this node has been explicitly %% dropped. Normally, non-durable queues would be tidied up on diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl index f245f913..9a4d5cbe 100644 --- a/src/rabbit_mirror_queue_slave.erl +++ b/src/rabbit_mirror_queue_slave.erl @@ -293,8 +293,7 @@ terminate(_Reason, #state { backing_queue_state = undefined }) -> %% We've received a delete_and_terminate from gm, thus nothing to %% do here. ok; -terminate({shutdown, dropped} = R, #state { gm = GM, - backing_queue = BQ, +terminate({shutdown, dropped} = R, #state { backing_queue = BQ, backing_queue_state = BQS }) -> %% See rabbit_mirror_queue_master:terminate/2 BQ:delete_and_terminate(R, BQS); |