diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2010-09-14 14:39:24 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2010-09-14 14:39:24 +0100 |
| commit | 5a7cc3caaa82c48d5a7b97e0776045f488a9a1d5 (patch) | |
| tree | 2a48eb47fdb91e44802856835882bff350a6c35a | |
| parent | b4d810a150ab4a49db4d93657e2d14f39b664bb3 (diff) | |
| download | rabbitmq-server-5a7cc3caaa82c48d5a7b97e0776045f488a9a1d5.tar.gz | |
Rename function.
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_channel.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_event.erl | 8 | ||||
| -rw-r--r-- | src/rabbit_reader.erl | 4 |
4 files changed, 10 insertions, 9 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index fd4d37aa..8f52130e 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -167,8 +167,8 @@ declare(Recover, From, State1 = init_expires(State#q{backing_queue_state = BQS}), rabbit_event:notify(queue_created, infos(?CREATION_EVENT_KEYS, State1)), - rabbit_event:maybe(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. diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 637bee30..596a0c53 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -177,7 +177,8 @@ init([Channel, ReaderPid, WriterPid, Username, VHost, CollectorPid, queue_collector_pid = CollectorPid, stats_timer = StatsTimer}, rabbit_event:notify(channel_created, infos(?CREATION_EVENT_KEYS, State)), - rabbit_event:maybe(StatsTimer, fun() -> internal_emit_stats(State) end), + rabbit_event:if_enabled(StatsTimer, + fun() -> internal_emit_stats(State) end), {ok, State, hibernate, {backoff, ?HIBERNATE_AFTER_MIN, ?HIBERNATE_AFTER_MIN, ?DESIRED_HIBERNATE}}. diff --git a/src/rabbit_event.erl b/src/rabbit_event.erl index d7d3ac47..4b862ace 100644 --- a/src/rabbit_event.erl +++ b/src/rabbit_event.erl @@ -36,7 +36,7 @@ -export([start_link/0]). -export([init_stats_timer/0, ensure_stats_timer/2]). -export([reset_stats_timer/1]). --export([stats_level/1, maybe/2]). +-export([stats_level/1, if_enabled/2]). -export([notify/2]). %%---------------------------------------------------------------------------- @@ -74,7 +74,7 @@ -spec(ensure_stats_timer/2 :: (state(), timer_fun()) -> state()). -spec(reset_stats_timer/1 :: (state()) -> state()). -spec(stats_level/1 :: (state()) -> level()). --spec(maybe/2 :: (state(), timer_fun()) -> 'ok'). +-spec(if_enabled/2 :: (state(), timer_fun()) -> 'ok'). -spec(notify/2 :: (event_type(), event_props()) -> 'ok'). -endif. @@ -126,9 +126,9 @@ stats_level(#state{level = Level}) -> Level. -maybe(#state{level = none}, _Fun) -> +if_enabled(#state{level = none}, _Fun) -> ok; -maybe(_State, Fun) -> +if_enabled(_State, Fun) -> Fun(), ok. diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index c99c8874..faa8f764 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -777,8 +777,8 @@ handle_method0(#'connection.open'{virtual_host = VHostPath}, connection = NewConnection}), rabbit_event:notify(connection_created, infos(?CREATION_EVENT_KEYS, State1)), - rabbit_event:maybe(StatsTimer, - fun() -> internal_emit_stats(State1) end), + rabbit_event:if_enabled(StatsTimer, + fun() -> internal_emit_stats(State1) end), State1; handle_method0(#'connection.close'{}, State) when ?IS_RUNNING(State) -> lists:foreach(fun rabbit_framing_channel:shutdown/1, all_channels()), |