diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-01-07 13:05:37 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-01-07 13:05:37 +0000 |
| commit | 0984a13df722a3546e4694f657c3b2a5cc9eefa8 (patch) | |
| tree | f0963193988f8692b3e1ed33064495c4fd701f85 | |
| parent | ab21c6474f680a1a90cf0906fbfcbc7a932b369b (diff) | |
| download | rabbitmq-server-git-0984a13df722a3546e4694f657c3b2a5cc9eefa8.tar.gz | |
Simplify further, don't use a proplist
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_queue_decorator.erl | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 7597ec9d84..0134964d90 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -221,8 +221,7 @@ notify_decorators(State = #q{consumers = Consumers, backing_queue_state = BQS}) -> P = rabbit_queue_consumers:max_active_priority(Consumers), decorator_callback(qname(State), active_consumers_changed, - [[{max_active_consumer_priority, P}, - {is_empty, BQ:is_empty(BQS)}]]). + [P, BQ:is_empty(BQS)]). decorator_callback(QName, F, A) -> %% Look up again in case policy and hence decorators have changed diff --git a/src/rabbit_queue_decorator.erl b/src/rabbit_queue_decorator.erl index b3c02403be..994c9060c6 100644 --- a/src/rabbit_queue_decorator.erl +++ b/src/rabbit_queue_decorator.erl @@ -17,7 +17,9 @@ -callback active_for(rabbit_types:amqqueue()) -> boolean(). --callback active_consumers_changed(rabbit_types:amqqueue(), any()) -> 'ok'. +%% called with Queue, MaxActivePriority, IsEmpty +-callback active_consumers_changed( + rabbit_types:amqqueue(), integer(), boolean()) -> 'ok'. -else. @@ -25,7 +27,7 @@ behaviour_info(callbacks) -> [{description, 0}, {startup, 1}, {shutdown, 1}, {policy_changed, 2}, - {active_for, 1}, {active_consumers_changed, 2}]; + {active_for, 1}, {active_consumers_changed, 3}]; behaviour_info(_Other) -> undefined. |