diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2010-07-26 16:12:52 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2010-07-26 16:12:52 +0100 |
| commit | 8ed9a53e3c075532be290debaf8b5d4303790bc1 (patch) | |
| tree | a2b4a2485ecaba444efce39357b6f36525502054 | |
| parent | 4019ae31d80cff08b542d84e7edcbf446b0201fc (diff) | |
| download | rabbitmq-server-8ed9a53e3c075532be290debaf8b5d4303790bc1.tar.gz | |
Use apply_interval rather than apply_after, cosmetics.
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 5 | ||||
| -rw-r--r-- | src/rabbit_channel.erl | 13 | ||||
| -rw-r--r-- | src/rabbit_reader.erl | 3 |
3 files changed, 9 insertions, 12 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index bf90ef23..c7c8cee3 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -237,9 +237,8 @@ stop_rate_timer(State = #q{rate_timer_ref = TRef}) -> ensure_stats_timer(State = #q{stats_level = none}) -> State; ensure_stats_timer(State = #q{stats_timer_ref = undefined, q = Q}) -> - {ok, TRef} = timer:apply_after(?STATS_INTERVAL, - rabbit_amqqueue, emit_stats, - [Q]), + {ok, TRef} = timer:apply_interval(?STATS_INTERVAL, + rabbit_amqqueue, emit_stats, [Q]), State#q{stats_timer_ref = TRef}; ensure_stats_timer(State) -> State. diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 5696d82d..4072a8df 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -281,9 +281,8 @@ handle_info({'EXIT', WriterPid, Reason = {writer, send_failed, _Error}}, handle_info({'EXIT', _Pid, Reason}, State) -> {stop, Reason, State}; handle_info({'DOWN', _MRef, process, QPid, _Reason}, State) -> - State1 = queue_blocked(QPid, State), erase_queue_stats(QPid), - {noreply, State1}. + {noreply, queue_blocked(QPid, State)}. handle_pre_hibernate(State) -> ok = clear_permission_cache(), @@ -306,19 +305,17 @@ code_change(_OldVsn, State, _Extra) -> %%--------------------------------------------------------------------------- reply(Reply, NewState) -> - NewState1 = ensure_stats_timer(NewState), - {reply, Reply, NewState1, hibernate}. + {reply, Reply, ensure_stats_timer(NewState), hibernate}. noreply(NewState) -> - NewState1 = ensure_stats_timer(NewState), - {noreply, NewState1, hibernate}. + {noreply, ensure_stats_timer(NewState), hibernate}. ensure_stats_timer(State = #ch{stats_level = none}) -> State; ensure_stats_timer(State = #ch{stats_timer_ref = undefined}) -> - {ok, TRef} = timer:apply_after(?STATS_INTERVAL, - rabbit_channel, emit_stats, [self()]), + {ok, TRef} = timer:apply_interval(?STATS_INTERVAL, + rabbit_channel, emit_stats, [self()]), State#ch{stats_timer_ref = TRef}; ensure_stats_timer(State) -> State. diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index ed48e29a..a2d92d2b 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -66,7 +66,8 @@ send_pend, state, channels]). -define(CREATION_EVENT_KEYS, [address, port, peer_address, peer_port, - user, vhost, timeout, frame_max, client_properties]). + user, vhost, timeout, frame_max, + client_properties]). -define(INFO_KEYS, ?CREATION_EVENT_KEYS ++ ?STATISTICS_KEYS). |