summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@rabbitmq.com>2011-07-27 12:43:56 +0100
committerMatthew Sackman <matthew@rabbitmq.com>2011-07-27 12:43:56 +0100
commit9a524e52f8fc8e79c27b765b31433127bc780f0e (patch)
treef033e6c96de4e31a677d10bb663af1661b61b581
parenta3bc422fa3e94686025d651f9326bb90c46f5158 (diff)
downloadrabbitmq-server-bug24305.tar.gz
It has been decided that masking out on write, is preferable to masking out on read.bug24305
-rw-r--r--src/rabbit_amqqueue.erl5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl
index d6e10471..1829d09b 100644
--- a/src/rabbit_amqqueue.erl
+++ b/src/rabbit_amqqueue.erl
@@ -230,7 +230,7 @@ internal_declare(Q = #amqqueue{name = QueueName}, false) ->
end).
store_queue(Q = #amqqueue{durable = true}) ->
- ok = mnesia:write(rabbit_durable_queue, Q, write),
+ ok = mnesia:write(rabbit_durable_queue, Q#amqqueue{slave_pids = []}, write),
ok = mnesia:write(rabbit_queue, Q, write),
ok;
store_queue(Q = #amqqueue{durable = false}) ->
@@ -254,8 +254,7 @@ determine_queue_nodes(Args) ->
end.
start_queue_process(Node, Q) ->
- {ok, Pid} = rabbit_amqqueue_sup:start_child(Node,
- [Q#amqqueue{slave_pids = []}]),
+ {ok, Pid} = rabbit_amqqueue_sup:start_child(Node, [Q]),
Q#amqqueue{pid = Pid}.
add_default_binding(#amqqueue{name = QueueName}) ->