diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2012-10-16 16:04:58 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2012-10-16 16:04:58 +0100 |
| commit | 01dbbdb6c072d65714bbc3ee6722741fec1384bc (patch) | |
| tree | 03d7e677c6151a792232bc533626e396b82725fb | |
| parent | 2a33ca9aaa644b10eb1b0efab74b50e9ce6cc24c (diff) | |
| download | rabbitmq-server-bug25202.tar.gz | |
cosmeticbug25202
| -rw-r--r-- | src/rabbit_mirror_queue_master.erl | 7 | ||||
| -rw-r--r-- | src/rabbit_mirror_queue_misc.erl | 1 | ||||
| -rw-r--r-- | src/rabbit_mirror_queue_slave.erl | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/src/rabbit_mirror_queue_master.erl b/src/rabbit_mirror_queue_master.erl index ce0d8d31..377d5186 100644 --- a/src/rabbit_mirror_queue_master.erl +++ b/src/rabbit_mirror_queue_master.erl @@ -106,8 +106,8 @@ init_with_existing_bq(Q = #amqqueue{name = QName}, BQ, BQS) -> fun () -> [Q1 = #amqqueue{gm_pids = GMPids}] = mnesia:read({rabbit_queue, QName}), - Q2 = Q1#amqqueue{gm_pids = [{GM, Self} | GMPids]}, - ok = rabbit_amqqueue:store_queue(Q2) + ok = rabbit_amqqueue:store_queue( + Q1#amqqueue{gm_pids = [{GM, Self} | GMPids]}) end), #state { gm = GM, coordinator = CPid, @@ -165,8 +165,7 @@ stop_all_slaves(Reason, #state{gm = GM}) -> fun () -> [Q] = mnesia:read({rabbit_queue, QName}), rabbit_mirror_queue_misc:store_updated_slaves( - Q #amqqueue { gm_pids = [], - slave_pids = [] }) + Q #amqqueue { gm_pids = [], slave_pids = [] }) end), ok = gm:forget_group(QName). diff --git a/src/rabbit_mirror_queue_misc.erl b/src/rabbit_mirror_queue_misc.erl index 48cbf645..901f33b1 100644 --- a/src/rabbit_mirror_queue_misc.erl +++ b/src/rabbit_mirror_queue_misc.erl @@ -68,7 +68,6 @@ remove_from_queue(QueueName, DeadGMPids) -> [Q = #amqqueue { pid = QPid, slave_pids = SPids, gm_pids = GMPids }] -> - {Dead, GMPids1} = lists:partition( fun ({GM, _}) -> lists:member(GM, DeadGMPids) diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl index 303569e0..afb85738 100644 --- a/src/rabbit_mirror_queue_slave.erl +++ b/src/rabbit_mirror_queue_slave.erl @@ -169,8 +169,7 @@ init_it(Self, GM, Node, QName) -> %% rabbit_mirror_queue_misc:promote_slave/1 add_slave(Q = #amqqueue { slave_pids = SPids, gm_pids = GMPids }, New, GM) -> rabbit_mirror_queue_misc:store_updated_slaves( - Q#amqqueue{slave_pids = SPids ++ [New], - gm_pids = [{GM, New} | GMPids]}). + Q#amqqueue{slave_pids = SPids ++ [New], gm_pids = [{GM, New} | GMPids]}). handle_call({deliver, Delivery, true}, From, State) -> %% Synchronous, "mandatory" deliver mode. |