diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 6 | ||||
| -rw-r--r-- | src/rabbit_channel.erl | 8 | ||||
| -rw-r--r-- | src/rabbit_event.erl | 1 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 8f4c200db8..b5adf5c1a8 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -888,6 +888,7 @@ handle_cast(emit_stats, State = #q{stats_timer = StatsTimer}) -> %% Do not invoke noreply as it would see no timer and create a new one. emit_stats(State), State1 = State#q{stats_timer = rabbit_event:reset_stats_timer(StatsTimer)}, + assert_invariant(State1), {noreply, State1}. handle_info({'DOWN', _MonitorRef, process, DownPid, _Reason}, @@ -927,5 +928,6 @@ handle_pre_hibernate(State = #q{backing_queue = BQ, rabbit_memory_monitor:report_ram_duration(self(), infinity), BQS2 = BQ:set_ram_duration_target(DesiredDuration, BQS1), emit_stats(State), - State1 = State#q{stats_timer = rabbit_event:stop_stats_timer(StatsTimer)}, - {hibernate, stop_rate_timer(State1#q{backing_queue_state = BQS2})}. + State1 = State#q{backing_queue_state = BQS2, + stats_timer = rabbit_event:stop_stats_timer(StatsTimer)}, + {hibernate, stop_rate_timer(State1)}. diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index bd52a40c4b..9b1372fa65 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -242,8 +242,8 @@ handle_cast({deliver, ConsumerTag, AckRequired, Msg}, handle_cast(emit_stats, State = #ch{stats_timer = StatsTimer}) -> internal_emit_stats(State), - State1 = State#ch{stats_timer = rabbit_event:reset_stats_timer(StatsTimer)}, - {noreply, State1}. + {noreply, + State#ch{stats_timer = rabbit_event:reset_stats_timer(StatsTimer)}}. handle_info({'DOWN', _MRef, process, QPid, _Reason}, State) -> erase_queue_stats(QPid), @@ -252,8 +252,8 @@ handle_info({'DOWN', _MRef, process, QPid, _Reason}, State) -> handle_pre_hibernate(State = #ch{stats_timer = StatsTimer}) -> ok = clear_permission_cache(), internal_emit_stats(State), - State1 = State#ch{stats_timer = rabbit_event:stop_stats_timer(StatsTimer)}, - {hibernate, State1}. + {hibernate, + State#ch{stats_timer = rabbit_event:stop_stats_timer(StatsTimer)}}. terminate(_Reason, State = #ch{state = terminating}) -> terminate(State); diff --git a/src/rabbit_event.erl b/src/rabbit_event.erl index 3ef02517c2..ba8a3e1f2b 100644 --- a/src/rabbit_event.erl +++ b/src/rabbit_event.erl @@ -134,7 +134,6 @@ reset_stats_timer(State) -> stats_level(#state{level = Level}) -> Level. - if_enabled(#state{level = none}, _Fun) -> ok; if_enabled(_State, Fun) -> |