diff options
| author | Ben Hood <0x6e6562@gmail.com> | 2008-08-06 00:16:43 +0100 |
|---|---|---|
| committer | Ben Hood <0x6e6562@gmail.com> | 2008-08-06 00:16:43 +0100 |
| commit | 0c64f4a46e5a008831771ba8385727079c950548 (patch) | |
| tree | e97a26a4cbf84d88ae7bb9b13293e18e4b9f1453 | |
| parent | 848a8b10e7548849427483d30a32df0e73fc32c7 (diff) | |
| download | rabbitmq-server-git-0c64f4a46e5a008831771ba8385727079c950548.tar.gz | |
First cut with queue declare
| -rw-r--r-- | src/rabbit_amqqueue.erl | 20 | ||||
| -rw-r--r-- | src/rabbit_exchange.erl | 5 |
2 files changed, 15 insertions, 10 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index 51b740c671..4e94eecaa7 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -163,20 +163,20 @@ start_queue_process(Q) -> recover_queue(Q) -> ok = store_queue(Q), - ok = recover_bindings(Q), + %ok = recover_bindings(Q), ok. -default_binding_spec(#resource{virtual_host = VHostPath, name = Name}) -> - #binding{exchange_name = <<"">>, - key = Name, - queue_name = Name}. +% default_binding_spec(#resource{virtual_host = VHostPath, name = Name}) -> +% #binding{exchange_name = <<"">>, +% key = Name, +% queue_name = Name}. % #binding_spec{exchange_name = rabbit_misc:r(VHostPath,exchange,<<"">>), % routing_key = Name, % arguments = []}. -recover_bindings(Q = #amqqueue{name = QueueName}) -> - io:format("Q was ~p~n",[Q]), - ok = rabbit_exchange:add_binding(default_binding_spec(QueueName)). +% recover_bindings(Q = #amqqueue{name = QueueName}) -> +% io:format("Q was ~p~n",[Q]), +% ok = rabbit_exchange:add_binding(default_binding_spec(QueueName)). % lists:foreach(fun (B) -> % ok = rabbit_exchange:add_binding(B, Q) % end, Specs), @@ -351,8 +351,8 @@ internal_delete(QueueName) -> delete_temp(Q = #amqqueue{name = QueueName}) -> ok = delete_bindings(Q), - ok = rabbit_exchange:delete_binding( - default_binding_spec(QueueName), Q), + %ok = rabbit_exchange:delete_binding( + % default_binding_spec(QueueName), Q), ok = mnesia:delete({amqqueue, QueueName}), ok. diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl index ab4d7568d4..b84b817206 100644 --- a/src/rabbit_exchange.erl +++ b/src/rabbit_exchange.erl @@ -78,9 +78,14 @@ %%---------------------------------------------------------------------------- recover() -> + ok = recover_default_exchange(), ok = recover_durable_exchanges(), ok. +recover_default_exchange() -> + rabbit_misc:execute_mnesia_transaction( + fun () -> mnesia:write(#exchange{name = <<"">>}) end). + recover_durable_exchanges() -> rabbit_misc:execute_mnesia_transaction( fun () -> |