diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2013-12-23 21:44:13 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2013-12-23 21:44:13 +0000 |
| commit | a5b96a8c71ce505fb4ce03cc9e58682cc6d5f228 (patch) | |
| tree | 8990b508900805e37d3fbf524769f5302b2dba82 | |
| parent | ddfabee97356e5337153f7c49af19b5b94c74a49 (diff) | |
| download | rabbitmq-server-a5b96a8c71ce505fb4ce03cc9e58682cc6d5f228.tar.gz | |
tiny refactors
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 497e620a..5a759430 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -235,10 +235,11 @@ notify_decorators(Event, Props, State) when Event =:= startup; notify_decorators(Event, Props, State = #q{active_consumers = ACs, backing_queue = BQ, backing_queue_state = BQS}) -> - decorator_callback( - qname(State), notify, - [Event, [{max_active_consumer_priority, priority_queue:highest(ACs)}, - {is_empty, BQ:is_empty(BQS)} | Props]]). + P = priority_queue:highest(ACs), + decorator_callback(qname(State), notify, + [Event, [{max_active_consumer_priority, P}, + {is_empty, BQ:is_empty(BQS)} | + Props]]). decorator_callback(QName, F, A) -> %% Look up again in case policy and hence decorators have changed @@ -1332,11 +1333,12 @@ handle_call(force_event_refresh, _From, State = #q{exclusive_consumer = Exclusive}) -> rabbit_event:notify(queue_created, infos(?CREATION_EVENT_KEYS, State)), QName = qname(State), + AllConsumers = consumers(State), case Exclusive of none -> [emit_consumer_created( Ch, CTag, false, AckRequired, QName, Args) || - {Ch, CTag, AckRequired, Args} <- consumers(State)]; - {Ch, CTag} -> [{Ch, CTag, AckRequired, Args}] = consumers(State), + {Ch, CTag, AckRequired, Args} <- AllConsumers]; + {Ch, CTag} -> [{Ch, CTag, AckRequired, Args}] = AllConsumers, emit_consumer_created( Ch, CTag, true, AckRequired, QName, Args) end, |