diff options
| author | Matthias Radestock <matthias@lshift.net> | 2010-04-16 14:21:42 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@lshift.net> | 2010-04-16 14:21:42 +0100 |
| commit | e8707c3e061125e853bff2db886e12283987d4b9 (patch) | |
| tree | 0297f41b1c91dc5e7b67e96cb23190023208849b | |
| parent | 2f081e4a682fb3f0bedcd619a85f88ba22f470ca (diff) | |
| parent | 77001fd4df8f02954d3c3c24ef636f997c228aab (diff) | |
| download | rabbitmq-server-git-e8707c3e061125e853bff2db886e12283987d4b9.tar.gz | |
merge default into bug21673
| -rw-r--r-- | src/rabbit_amqqueue.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_amqqueue_sup.erl | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index 3ca39e108f..9406008e29 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -213,8 +213,7 @@ store_queue(Q = #amqqueue{durable = false}) -> ok. start_queue_process(Q, InitBackingQueue) -> - {ok, Pid} = - supervisor2:start_child(rabbit_amqqueue_sup, [Q, InitBackingQueue]), + {ok, Pid} = rabbit_amqqueue_sup:start_child([Q, InitBackingQueue]), Q#amqqueue{pid = Pid}. add_default_binding(#amqqueue{name = QueueName}) -> diff --git a/src/rabbit_amqqueue_sup.erl b/src/rabbit_amqqueue_sup.erl index f30c9fd5e6..97d6cef9c2 100644 --- a/src/rabbit_amqqueue_sup.erl +++ b/src/rabbit_amqqueue_sup.erl @@ -33,7 +33,7 @@ -behaviour(supervisor2). --export([start_link/0]). +-export([start_link/0, start_child/1]). -export([init/1]). @@ -44,6 +44,9 @@ start_link() -> supervisor2:start_link({local, ?SERVER}, ?MODULE, []). +start_child(Args) -> + supervisor2:start_child(?SERVER, Args). + init([]) -> {ok, {{simple_one_for_one_terminate, 10, 10}, [{rabbit_amqqueue, {rabbit_amqqueue_process, start_link, []}, |