summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2010-09-07 14:52:25 +0100
committerSimon MacMullen <simon@rabbitmq.com>2010-09-07 14:52:25 +0100
commit52b7ca393ba86e9ccbe6ef01ac2eacd05c43b316 (patch)
treebe4ef559588ea5753ea07ca090a1a60b55543a23
parentff53fd5e75111639cfa95102616dffbe31e6c464 (diff)
downloadrabbitmq-server-52b7ca393ba86e9ccbe6ef01ac2eacd05c43b316.tar.gz
Emit stats just after creation event.
-rw-r--r--src/rabbit_amqqueue_process.erl6
-rw-r--r--src/rabbit_channel.erl1
-rw-r--r--src/rabbit_reader.erl1
3 files changed, 6 insertions, 2 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index 08495862..5b4f2c41 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -163,9 +163,11 @@ declare(Recover, From,
self(), {rabbit_amqqueue,
set_ram_duration_target, [self()]}),
BQS = BQ:init(QName, IsDurable, Recover),
+ State1 = State#q{backing_queue_state = BQS},
rabbit_event:notify(queue_created,
- infos(?CREATION_EVENT_KEYS, State)),
- noreply(init_expires(State#q{backing_queue_state = BQS}));
+ infos(?CREATION_EVENT_KEYS, State1)),
+ emit_stats(State1),
+ noreply(init_expires(State1));
Q1 -> {stop, normal, {existing, Q1}, State}
end.
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index 174eab40..19d85589 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -176,6 +176,7 @@ init([Channel, ReaderPid, WriterPid, Username, VHost, CollectorPid,
queue_collector_pid = CollectorPid,
stats_timer = rabbit_event:init_stats_timer()},
rabbit_event:notify(channel_created, infos(?CREATION_EVENT_KEYS, State)),
+ internal_emit_stats(State),
{ok, State, hibernate,
{backoff, ?HIBERNATE_AFTER_MIN, ?HIBERNATE_AFTER_MIN, ?DESIRED_HIBERNATE}}.
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index a21961b5..0ddc60e8 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -775,6 +775,7 @@ handle_method0(#'connection.open'{virtual_host = VHostPath},
connection = NewConnection}),
rabbit_event:notify(connection_created,
infos(?CREATION_EVENT_KEYS, State1)),
+ internal_emit_stats(State1),
State1;
handle_method0(#'connection.close'{}, State) when ?IS_RUNNING(State) ->
lists:foreach(fun rabbit_framing_channel:shutdown/1, all_channels()),