diff options
| -rw-r--r-- | src/rabbit_amqqueue.erl | 12 | ||||
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 25 |
2 files changed, 17 insertions, 20 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index 3dcb34a194..89a8002519 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -288,13 +288,11 @@ with_exclusive_access_or_die(Name, ReaderPid, F) -> check_argument_equivalent(Prev, Now, Key, QueueName) -> case {rabbit_misc:table_lookup(Now, Key), rabbit_misc:table_lookup(Prev, Key)} of - {Same, Same} -> - ok; - {New, Old} -> - rabbit_misc:protocol_error( - precondition_failed, - "arguments for ~s not equivalent: ~s=~w (was ~w)", - [rabbit_misc:rs(QueueName), Key, New, Old]) + {Same, Same} -> ok; + {New, Old} -> rabbit_misc:protocol_error( + precondition_failed, + "arguments for ~s not equivalent: ~s=~w (was ~w)", + [rabbit_misc:rs(QueueName), Key, New, Old]) end. list(VHostPath) -> diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 1bd82abda9..de83ed7d7c 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -59,7 +59,8 @@ expires, sync_timer_ref, rate_timer_ref, - expiry_timer_ref}). + expiry_timer_ref + }). -record(consumer, {tag, ack_required}). @@ -124,15 +125,15 @@ init(Q) -> {ok, BQ} = application:get_env(backing_queue_module), State = #q{q = Q#amqqueue{pid = self()}, - exclusive_consumer = none, - has_had_consumers = false, - backing_queue = BQ, - backing_queue_state = undefined, - active_consumers = queue:new(), - blocked_consumers = queue:new(), - sync_timer_ref = undefined, - rate_timer_ref = undefined, - expiry_timer_ref = undefined}, + exclusive_consumer = none, + has_had_consumers = false, + backing_queue = BQ, + backing_queue_state = undefined, + active_consumers = queue:new(), + blocked_consumers = queue:new(), + sync_timer_ref = undefined, + rate_timer_ref = undefined, + expiry_timer_ref = undefined}, case init_expires(State) of {error, Error} -> {stop, Error}; @@ -258,9 +259,7 @@ start_expiry_timer(State = #q{expires = Expires}) -> ?LOGDEBUG("~p: Starting expire timer: ~p~n", [State#q.q, Expires]), NewState = stop_expiry_timer(State), {ok, TRef} = timer:apply_after( - Expires, - rabbit_amqqueue, maybe_expire, - [self()]), + Expires, rabbit_amqqueue, maybe_expire, [self()]), NewState#q{expiry_timer_ref = TRef}. start_expiry_timer(State, Expires) -> |