diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2010-10-11 16:11:50 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2010-10-11 16:11:50 +0100 |
| commit | 989688f0fb35362bf4a125bacd5ecbc0e84c7b15 (patch) | |
| tree | 7c2c90999d90de8a2a7b72f448da943bea7f9219 /src | |
| parent | 383a5ceeebbc1ae97cf25991d73a77089a033e1a (diff) | |
| download | rabbitmq-server-git-989688f0fb35362bf4a125bacd5ecbc0e84c7b15.tar.gz | |
Typeo in spec, and simplify delete_queues as order of operations here doesn't matter
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_amqqueue.erl | 12 | ||||
| -rw-r--r-- | src/rabbit_exchange.erl | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index d047f7caed..572bfc0148 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -474,18 +474,16 @@ on_node_down(Node) -> fun rabbit_binding:combine_deletions/2, rabbit_binding:new_deletions(), rabbit_misc:execute_mnesia_transaction( - fun () -> - qlc:e(qlc:q([delete_queue(QueueName) || - #amqqueue{name = QueueName, pid = Pid} - <- mnesia:table(rabbit_queue), - node(Pid) == Node])) + fun () -> qlc:e(qlc:q([delete_queue(QueueName) || + #amqqueue{name = QueueName, pid = Pid} + <- mnesia:table(rabbit_queue), + node(Pid) == Node])) end)), ok = rabbit_binding:process_deletions(Deletions). delete_queue(QueueName) -> - Deletions = rabbit_binding:remove_transient_for_destination(QueueName), ok = mnesia:delete({rabbit_queue, QueueName}), - Deletions. + rabbit_binding:remove_transient_for_destination(QueueName). pseudo_queue(QueueName, Pid) -> #amqqueue{name = QueueName, diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl index 0ddeca370d..465642332c 100644 --- a/src/rabbit_exchange.erl +++ b/src/rabbit_exchange.erl @@ -84,7 +84,7 @@ rabbit_types:error('in_use')). -spec(maybe_auto_delete/1:: (rabbit_types:exchange()) - -> 'not_deleted' | {'deleted', rabbit_binding:dictionary()}). + -> 'not_deleted' | {'deleted', rabbit_binding:deletions()}). -endif. |