diff options
| author | Tim Watson <tim@rabbitmq.com> | 2012-07-25 09:50:48 +0100 |
|---|---|---|
| committer | Tim Watson <tim@rabbitmq.com> | 2012-07-25 09:50:48 +0100 |
| commit | 01299fadcab0a96356d1c5c0251e63963acfed8b (patch) | |
| tree | 3124d0e4b7024965f2b9d62567867eecdba22711 | |
| parent | 9bdbbb95b85dd9d3a1a5bf501e96e172ae3899e0 (diff) | |
| download | rabbitmq-server-01299fadcab0a96356d1c5c0251e63963acfed8b.tar.gz | |
simplify match on master pids
| -rw-r--r-- | src/rabbit_mirror_queue_slave.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl index 1df7d0dd..c4ae307c 100644 --- a/src/rabbit_mirror_queue_slave.erl +++ b/src/rabbit_mirror_queue_slave.erl @@ -143,7 +143,7 @@ init(#amqqueue { name = QueueName } = Q) -> ?DESIRED_HIBERNATE}}; {stale, StalePid} -> {stop, {stale_master_pid, StalePid}}; - duplicate_master -> + duplicate_live_master -> {stop, {duplicate_live_master, Node}}; existing -> ignore @@ -157,10 +157,10 @@ init_it(Self, Node, QueueName) -> MPids1 = MPids ++ [Self], ok = rabbit_amqqueue:store_queue(Q1#amqqueue{slave_pids=MPids1}), {new, QPid}; - [MPid] when MPid =:= QPid -> - case rabbit_misc:is_process_alive(MPid) of - true -> duplicate_master; - false -> {stale, MPid} + [QPid] -> + case rabbit_misc:is_process_alive(QPid) of + true -> duplicate_live_master; + false -> {stale, QPid} end; [SPid] -> case rabbit_misc:is_process_alive(SPid) of |