diff options
| author | Tim Watson <tim@rabbitmq.com> | 2013-06-20 18:35:53 +0100 |
|---|---|---|
| committer | Tim Watson <tim@rabbitmq.com> | 2013-06-20 18:35:53 +0100 |
| commit | 8312498ee95c78e5a6c295d7971b9a3de65e147a (patch) | |
| tree | 4019aa5931de2211b899ab9bfae6ede476e5ad72 /src/rabbit_client_sup.erl | |
| parent | 4708a53c6219e8ab77a49ab18b9219fe0b6484e3 (diff) | |
| parent | d52a1435e1aec1b8ae4d2a314b45d77822d65e07 (diff) | |
| download | rabbitmq-server-8312498ee95c78e5a6c295d7971b9a3de65e147a.tar.gz | |
merge stable into default
Diffstat (limited to 'src/rabbit_client_sup.erl')
| -rw-r--r-- | src/rabbit_client_sup.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/rabbit_client_sup.erl b/src/rabbit_client_sup.erl index 7cc11fef..16a640ec 100644 --- a/src/rabbit_client_sup.erl +++ b/src/rabbit_client_sup.erl @@ -49,8 +49,9 @@ start_link_worker(SupName, Callback) -> supervisor2:start_link(SupName, ?MODULE, {Callback, worker}). init({M,F,A}) -> - {ok, {{simple_one_for_one_terminate, 0, 1}, + {ok, {{simple_one_for_one, 0, 1}, [{client, {M,F,A}, temporary, infinity, supervisor, [M]}]}}; init({{M,F,A}, worker}) -> - {ok, {{simple_one_for_one_terminate, 0, 1}, + {ok, {{simple_one_for_one, 0, 1}, [{client, {M,F,A}, temporary, ?MAX_WAIT, worker, [M]}]}}. + |