diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-01-30 17:04:56 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-01-30 17:04:56 +0000 |
| commit | 91f010a796bbfd7f4c48a71f451337cad805e628 (patch) | |
| tree | dd3af33cb1df1ef16abd986ec2ab0169049dd1be | |
| parent | 3c7ab3edf549909510a903dda25d89fa74dea281 (diff) | |
| download | rabbitmq-server-91f010a796bbfd7f4c48a71f451337cad805e628.tar.gz | |
Don't use timer:apply_interval/4.
| -rw-r--r-- | src/rabbit_mirror_queue_coordinator.erl | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/rabbit_mirror_queue_coordinator.erl b/src/rabbit_mirror_queue_coordinator.erl index 8ed2bede..c379cdca 100644 --- a/src/rabbit_mirror_queue_coordinator.erl +++ b/src/rabbit_mirror_queue_coordinator.erl @@ -325,8 +325,7 @@ init([#amqqueue { name = QueueName } = Q, GM, DeathFun, LengthFun]) -> true = link(GM), GM end, - {ok, _TRef} = - timer:apply_interval(?ONE_SECOND, gm, broadcast, [GM1, heartbeat]), + ensure_gm_heartbeat(), {ok, #state { q = Q, gm = GM1, monitors = dict:new(), @@ -366,6 +365,11 @@ handle_cast({ensure_monitoring, Pids}, end, Monitors, Pids), noreply(State #state { monitors = Monitors1 }). +handle_info(send_gm_heartbeat, State = #state{gm = GM}) -> + gm:broadcast(GM, heartbeat), + ensure_gm_heartbeat(), + noreply(State); + handle_info({'DOWN', _MonitorRef, process, Pid, _Reason}, State = #state { monitors = Monitors, death_fun = DeathFun }) -> @@ -410,6 +414,9 @@ handle_msg([CPid], _From, {ensure_monitoring, _Pids} = Msg) -> handle_msg([_CPid], _From, _Msg) -> ok. +ensure_gm_heartbeat() -> + erlang:send_after(?ONE_SECOND, self(), send_gm_heartbeat). + %% --------------------------------------------------------------------------- %% Others %% --------------------------------------------------------------------------- |