diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2012-12-05 12:31:30 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2012-12-05 12:31:30 +0000 |
| commit | d1b51c5e40185e45481971d02d11f01f1cf97d2a (patch) | |
| tree | b5cc57d363e61c30e49d3557da1e15cbff6464d2 /src | |
| parent | aced165290575062a98f6e5774c3780f40ee3dc0 (diff) | |
| parent | 278fc54f6ff9250432e140d2a8459a0a39504a05 (diff) | |
| download | rabbitmq-server-git-d1b51c5e40185e45481971d02d11f01f1cf97d2a.tar.gz | |
merge bug25340 into stable
Diffstat (limited to 'src')
| -rw-r--r-- | src/gm.erl | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/gm.erl b/src/gm.erl index 4a95de0dd1..2057b1f577 100644 --- a/src/gm.erl +++ b/src/gm.erl @@ -667,6 +667,9 @@ handle_info(flush, State) -> noreply( flush_broadcast_buffer(State #state { broadcast_timer = undefined })); +handle_info(timeout, State) -> + noreply(flush_broadcast_buffer(State)); + handle_info({'DOWN', MRef, process, _Pid, Reason}, State = #state { self = Self, left = Left, @@ -834,10 +837,13 @@ handle_msg({activity, _NotLeft, _Activity}, State) -> noreply(State) -> - {noreply, ensure_broadcast_timer(State), hibernate}. + {noreply, ensure_broadcast_timer(State), flush_timeout(State)}. reply(Reply, State) -> - {reply, Reply, ensure_broadcast_timer(State), hibernate}. + {reply, Reply, ensure_broadcast_timer(State), flush_timeout(State)}. + +flush_timeout(#state{broadcast_buffer = []}) -> hibernate; +flush_timeout(_) -> 0. ensure_broadcast_timer(State = #state { broadcast_buffer = [], broadcast_timer = undefined }) -> |