diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-08-09 12:02:24 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-08-09 12:02:24 +0100 |
| commit | c3c7fd6557cc8aced1786ba82e0fc3cb05604c0d (patch) | |
| tree | a1153472eb21c950713c6d3820a16051b279b734 | |
| parent | d13177cc7ef5466f09f2827fc040c4725b8ccf2c (diff) | |
| download | rabbitmq-server-git-c3c7fd6557cc8aced1786ba82e0fc3cb05604c0d.tar.gz | |
Merge all the _exists events back to _created.
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 16 | ||||
| -rw-r--r-- | src/rabbit_channel.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_reader.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_tests.erl | 4 |
4 files changed, 11 insertions, 13 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 06ba1177bf..98ad015095 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -760,8 +760,8 @@ emit_stats(State) -> emit_stats(State, Extra) -> rabbit_event:notify(queue_stats, Extra ++ infos(?STATISTICS_KEYS, State)). -emit_consumer_event(ChPid, ConsumerTag, Exclusive, AckRequired, Type) -> - rabbit_event:notify(Type, +emit_consumer_created(ChPid, ConsumerTag, Exclusive, AckRequired) -> + rabbit_event:notify(consumer_created, [{consumer_tag, ConsumerTag}, {exclusive, Exclusive}, {ack_required, AckRequired}, @@ -935,8 +935,8 @@ handle_call({basic_consume, NoAck, ChPid, LimiterPid, add_consumer(ChPid, Consumer, State1#q.active_consumers)}) end, - emit_consumer_event(ChPid, ConsumerTag, ExclusiveConsume, - not NoAck, consumer_created), + emit_consumer_created(ChPid, ConsumerTag, ExclusiveConsume, + not NoAck), reply(ok, State2) end; @@ -1088,14 +1088,12 @@ handle_cast({set_maximum_since_use, Age}, State) -> noreply(State); handle_cast(force_event_refresh, State = #q{exclusive_consumer = Exclusive}) -> - rabbit_event:notify(queue_exists, infos(?CREATION_EVENT_KEYS, State)), + rabbit_event:notify(queue_created, infos(?CREATION_EVENT_KEYS, State)), case Exclusive of - none -> [emit_consumer_event(Ch, CTag, false, AckRequired, - consumer_exists) || + none -> [emit_consumer_created(Ch, CTag, false, AckRequired) || {Ch, CTag, AckRequired} <- consumers(State)]; {Ch, CTag} -> [{Ch, CTag, AckRequired}] = consumers(State), - emit_consumer_event(Ch, CTag, true, AckRequired, - consumer_exists) + emit_consumer_created(Ch, CTag, true, AckRequired) end, noreply(State). diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 76367c1928..1193754823 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -310,7 +310,7 @@ handle_cast({deliver, ConsumerTag, AckRequired, handle_cast(force_event_refresh, State) -> - rabbit_event:notify(channel_exists, infos(?CREATION_EVENT_KEYS, State)), + rabbit_event:notify(channel_created, infos(?CREATION_EVENT_KEYS, State)), noreply(State); handle_cast({confirm, MsgSeqNos, From}, State) -> State1 = #ch{confirmed = C} = confirm(MsgSeqNos, From, State), diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 8a1a77686b..7eec2a2ea0 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -323,7 +323,7 @@ handle_other({'$gen_call', From, {info, Items}}, Deb, State) -> end), mainloop(Deb, State); handle_other({'$gen_cast', force_event_refresh}, Deb, State) -> - rabbit_event:notify(connection_exists, + rabbit_event:notify(connection_created, [{type, network} | infos(?CREATION_EVENT_KEYS, State)]), mainloop(Deb, State); handle_other(emit_stats, Deb, State) -> diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index 5d2bcff5d2..b1413eb0c5 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -1457,13 +1457,13 @@ test_refresh_events(SecondaryNode) -> {_Writer, Ch} = test_spawn(), Expect(Ch, channel_created), rabbit:force_event_refresh(), - Expect(Ch, channel_exists), + Expect(Ch, channel_created), rabbit_channel:shutdown(Ch), {_Writer2, Ch2} = test_spawn(SecondaryNode), Expect(Ch2, channel_created), rabbit:force_event_refresh(), - Expect(Ch2, channel_exists), + Expect(Ch2, channel_created), rabbit_channel:shutdown(Ch2), rabbit_tests_event_receiver:stop(), |