diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2010-09-21 12:59:48 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2010-09-21 12:59:48 +0100 |
| commit | 4e60e48190e377e8ff3b0299f1f51b58b0ce4572 (patch) | |
| tree | ae7ab7494515bd7897243759dfb051a56d202044 | |
| parent | 653dc26405d84a387af285f46d07cded1448d2e7 (diff) | |
| parent | a3d460b03c8fc8008fb09956baa79b8833faf15b (diff) | |
| download | rabbitmq-server-git-4e60e48190e377e8ff3b0299f1f51b58b0ce4572.tar.gz | |
Merging heads
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 1 | ||||
| -rw-r--r-- | src/rabbit_channel.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_event.erl | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index c80df02cd8..6a59858ba0 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}, diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index a199a02e43..6fbdef8016 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), diff --git a/src/rabbit_event.erl b/src/rabbit_event.erl index ff323a21ab..2b23653112 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) -> |