diff options
| author | Ben Hood <0x6e6562@gmail.com> | 2008-07-22 10:25:51 +0100 |
|---|---|---|
| committer | Ben Hood <0x6e6562@gmail.com> | 2008-07-22 10:25:51 +0100 |
| commit | 0b8916a1b7f354d1936a75115b5cdc4b7b0cc817 (patch) | |
| tree | 14f005419fa741ab43251c5edc961b1f6ac3f278 /src | |
| parent | 834f77f3ce997d846ee4710940e5508566f2b0a6 (diff) | |
| download | rabbitmq-server-git-0b8916a1b7f354d1936a75115b5cdc4b7b0cc817.tar.gz | |
Put the default bindings back in
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_amqqueue.erl | 10 | ||||
| -rw-r--r-- | src/rabbit_exchange.erl | 6 |
2 files changed, 6 insertions, 10 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index 7da0ab01ab..2ca78699d4 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -167,15 +167,13 @@ recover_queue(Q) -> ok = recover_bindings(Q), ok. -default_binding_spec(Name) -> - #binding_spec{exchange_name = <<>>, +default_binding_spec(#resource{virtual_host = VHostPath, name = Name}) -> + #binding_spec{exchange_name = rabbit_misc:r(VHostPath,exchange,<<"">>), routing_key = Name, arguments = []}. -recover_bindings(Q = #amqqueue{name = #resource{name = QueueName}, - binding_specs = Specs}) -> - % TODO I don't this should be commented out - %ok = rabbit_exchange:add_binding(default_binding_spec(QueueName), Q), +recover_bindings(Q = #amqqueue{name = QueueName, binding_specs = Specs}) -> + ok = rabbit_exchange:add_binding(default_binding_spec(QueueName), Q), lists:foreach(fun (B) -> ok = rabbit_exchange:add_binding(B, Q) end, Specs), diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl index b09ac24e52..5a462e4be1 100644 --- a/src/rabbit_exchange.erl +++ b/src/rabbit_exchange.erl @@ -151,9 +151,8 @@ list_exchange_bindings(Name) -> queue = QueueName} <- Handlers]. bindings_for_exchange(Name) -> - qlc:e(qlc:q([B || - B = #binding{key = K} <- mnesia:table(binding), - element(1, K) == Name])). + qlc:e(qlc:q([B || B = #binding{key = K} <- mnesia:table(binding), + element(1, K) == Name])). empty_handlers() -> []. @@ -215,7 +214,6 @@ delivery_key_for_type(fanout, Name, _RoutingKey) -> delivery_key_for_type(_Type, Name, RoutingKey) -> {Name, RoutingKey}. -%call_with_exchange(R = #resource{name = Name}, Fun) -> call_with_exchange(R, Fun); call_with_exchange(Name, Fun) -> case mnesia:wread({exchange, Name}) of [] -> {error, not_found}; |