diff options
author | Matthew Sackman <matthew@lshift.net> | 2010-05-12 15:22:35 +0100 |
---|---|---|
committer | Matthew Sackman <matthew@lshift.net> | 2010-05-12 15:22:35 +0100 |
commit | 423c55c4819bd322efca74eb9b1be34eda0335a9 (patch) | |
tree | 991b781753ec79d5c0c8fcce49d851c21a73aa0c | |
parent | 8a5c679c66dddaa111dc8bfb93cb744a3987a224 (diff) | |
download | rabbitmq-server-bug22695.tar.gz |
Correct formattingbug22695
-rw-r--r-- | src/rabbit_amqqueue_process.erl | 46 |
1 files changed, 25 insertions, 21 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 0d9e53db..ff1b8f1b 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -517,26 +517,30 @@ handle_call({init, Recover}, From, State = #q{q = Q = #amqqueue{name = QName, durable = IsDurable, exclusive_owner = ExclusiveOwner}, backing_queue = BQ, backing_queue_state = undefined}) -> - Declare = fun() -> - case rabbit_amqqueue:internal_declare(Q, Recover) of - not_found -> - {stop, normal, not_found, State}; - Q -> - gen_server2:reply(From, Q), - ok = file_handle_cache:register_callback( - rabbit_amqqueue, set_maximum_since_use, [self()]), - ok = rabbit_memory_monitor:register( - self(), - {rabbit_amqqueue, set_ram_duration_target, [self()]}), - noreply(State#q{backing_queue_state = - BQ:init(QName, IsDurable, Recover)}); - Q1 -> - {stop, normal, Q1, State} - end - end, + Declare = + fun() -> + case rabbit_amqqueue:internal_declare(Q, Recover) of + not_found -> + {stop, normal, not_found, State}; + Q -> + gen_server2:reply(From, Q), + ok = file_handle_cache:register_callback( + rabbit_amqqueue, set_maximum_since_use, + [self()]), + ok = rabbit_memory_monitor:register( + self(), {rabbit_amqqueue, + set_ram_duration_target, [self()]}), + noreply( + State#q{backing_queue_state = + BQ:init(QName, IsDurable, Recover)}); + Q1 -> + {stop, normal, Q1, State} + end + end, case ExclusiveOwner of - none -> Declare(); + none -> + Declare(); Owner -> case rpc:call(node(Owner), erlang, is_process_alive, [Owner]) of true -> @@ -546,13 +550,13 @@ handle_call({init, Recover}, From, case Recover of true -> ok; _ -> rabbit_log:warning( - "Queue ~p exclusive owner went away~n", - [QName]) + "Queue ~p exclusive owner went away~n", + [QName]) end, %% Rely on terminate to delete the queue. {stop, normal, not_found, State#q{backing_queue_state = - BQ:init(QName, IsDurable, Recover)}} + BQ:init(QName, IsDurable, Recover)}} end end; |