summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@rabbitmq.com>2010-09-21 13:01:50 +0100
committerMatthew Sackman <matthew@rabbitmq.com>2010-09-21 13:01:50 +0100
commit0d0d11f356e4b57baa94f61ed9363ae3c1089c22 (patch)
tree1dacc559926de73e25f807fd0bfd0faeab07d4d3
parent0df493a7fda12e3b89a30df9cc4bf164474c7c70 (diff)
downloadrabbitmq-server-0d0d11f356e4b57baa94f61ed9363ae3c1089c22.tar.gz
cosmeticsbug23193
-rw-r--r--src/rabbit_amqqueue_process.erl5
-rw-r--r--src/rabbit_channel.erl4
2 files changed, 5 insertions, 4 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index 6a59858b..87342c7c 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -928,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),
rabbit_event:if_enabled(StatsTimer, fun () -> emit_stats(State) end),
- State1 = State#q{stats_timer = rabbit_event:stop_stats_timer(StatsTimer)},
- {hibernate, stop_rate_timer(State1#q{backing_queue_state = BQS2})}.
+ State1 = State#q{stats_timer = rabbit_event:stop_stats_timer(StatsTimer),
+ backing_queue_state = BQS2},
+ {hibernate, stop_rate_timer(State1)}.
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index 6fbdef80..730fd8fd 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -254,8 +254,8 @@ handle_pre_hibernate(State = #ch{stats_timer = StatsTimer}) ->
rabbit_event:if_enabled(StatsTimer, fun () ->
internal_emit_stats(State)
end),
- 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);