diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2013-12-06 17:18:12 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2013-12-06 17:18:12 +0000 |
| commit | 4f8ce9027cc4a41971f745e648fc8e2288bd5edc (patch) | |
| tree | 563253f504f0040d2ef0a7e2432a2f93e823cb54 /src | |
| parent | fadc9f333a6223077068acda0a35c3bd7570e062 (diff) | |
| parent | 3f48840af18cd67cdf5888e6eaa827a537502840 (diff) | |
| download | rabbitmq-server-git-4f8ce9027cc4a41971f745e648fc8e2288bd5edc.tar.gz | |
Merge bug25899
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_reader.erl | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index e00732fdcf..46c5c42a45 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -1073,8 +1073,18 @@ maybe_emit_stats(State) -> fun() -> emit_stats(State) end). emit_stats(State) -> - rabbit_event:notify(connection_stats, infos(?STATISTICS_KEYS, State)), - rabbit_event:reset_stats_timer(State, #v1.stats_timer). + Infos = infos(?STATISTICS_KEYS, State), + rabbit_event:notify(connection_stats, Infos), + State1 = rabbit_event:reset_stats_timer(State, #v1.stats_timer), + %% If we emit an event which looks like we are in flow control, it's not a + %% good idea for it to be our last even if we go idle. Keep emitting + %% events, either we stay busy or we drop out of flow control. + %% The 5 is to match the test in formatters.js:fmt_connection_state(). + %% This magic number will go away when bug 24829 is merged. + case proplists:get_value(last_blocked_age, Infos) < 5 of + true -> ensure_stats_timer(State1); + _ -> State1 + end. %% 1.0 stub -ifdef(use_specs). |