diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-08-03 12:26:34 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-08-03 12:26:34 +0100 |
| commit | 10f12a2b0d464dc6642ebd04eebb411468eba2c1 (patch) | |
| tree | d1e531f6a78b2ab4fce7955e765ce292ad4de8a7 | |
| parent | 227bdc662000b68b4a63a4086f918f73b5ddfe9f (diff) | |
| download | rabbitmq-server-bug23504.tar.gz | |
Cosmeticbug23504
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 13 | ||||
| -rw-r--r-- | src/rabbit_channel.erl | 3 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 0b4b62f5..05de48d6 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -182,9 +182,8 @@ declare(Recover, From, State1 = process_args(State#q{backing_queue_state = BQS}), rabbit_event:notify(queue_created, infos(?CREATION_EVENT_KEYS, State1)), - rabbit_event:if_enabled( - StatsTimer, - fun() -> emit_stats(State1) end), + rabbit_event:if_enabled(StatsTimer, + fun() -> emit_stats(State1) end), noreply(State1); Q1 -> {stop, normal, {existing, Q1}, State} end. @@ -299,10 +298,10 @@ ensure_expiry_timer(State = #q{expires = Expires}) -> State end. -ensure_stats_timer(State = #q { stats_timer = StatsTimer, - q = #amqqueue { pid = QPid }}) -> - State #q { stats_timer = rabbit_event:ensure_stats_timer( - StatsTimer, QPid, emit_stats) }. +ensure_stats_timer(State = #q{stats_timer = StatsTimer, + q = #amqqueue{pid = QPid}}) -> + State#q{stats_timer = rabbit_event:ensure_stats_timer( + StatsTimer, QPid, emit_stats)}. assert_invariant(#q{active_consumers = AC, backing_queue = BQ, backing_queue_state = BQS}) -> diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 72d6d33a..45f0032d 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -306,8 +306,7 @@ handle_info(timeout, State) -> handle_info(emit_stats, State = #ch{stats_timer = StatsTimer}) -> emit_stats(State), noreply([ensure_stats_timer], - State#ch{ - stats_timer = rabbit_event:reset_stats_timer(StatsTimer)}); + State#ch{stats_timer = rabbit_event:reset_stats_timer(StatsTimer)}); handle_info({'DOWN', MRef, process, QPid, Reason}, State = #ch{consumer_monitors = ConsumerMonitors}) -> |