diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2013-03-14 17:27:24 +0000 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2013-03-14 17:27:24 +0000 |
| commit | 9bacf2cffe11c2663570d5be6b27a75ee34e835c (patch) | |
| tree | 73021f55961bfc63ae08f925117cf2dd3f65d07a | |
| parent | 30de9348b000e844caeeccf629d6f697fd3ec10a (diff) | |
| download | rabbitmq-server-git-9bacf2cffe11c2663570d5be6b27a75ee34e835c.tar.gz | |
rabbit_client_sup accepts supervision options
| -rw-r--r-- | src/rabbit_client_sup.erl | 16 | ||||
| -rw-r--r-- | src/rabbit_direct.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_networking.erl | 2 |
3 files changed, 12 insertions, 8 deletions
diff --git a/src/rabbit_client_sup.erl b/src/rabbit_client_sup.erl index 9602c51248..54bb8671b3 100644 --- a/src/rabbit_client_sup.erl +++ b/src/rabbit_client_sup.erl @@ -37,12 +37,16 @@ %%---------------------------------------------------------------------------- -start_link(Callback) -> - supervisor2:start_link(?MODULE, Callback). +start_link(CallbackOpts) -> + supervisor2:start_link(?MODULE, CallbackOpts). -start_link(SupName, Callback) -> - supervisor2:start_link(SupName, ?MODULE, Callback). +start_link(SupName, CallbackOpts) -> + supervisor2:start_link(SupName, ?MODULE, CallbackOpts). -init({M,F,A}) -> +init({{M,F,A},Opts}) -> + {Shutdown, Type} = case rabbit_misc:pget(worker_type, Opts, supervisor) of + supervisor -> {infinity, supervisor}; + worker -> {?MAX_WAIT, worker} + end, {ok, {{simple_one_for_one_terminate, 0, 1}, - [{client, {M,F,A}, temporary, infinity, supervisor, [M]}]}}. + [{client, {M,F,A}, temporary, Shutdown, Type, [M]}]}}. diff --git a/src/rabbit_direct.erl b/src/rabbit_direct.erl index 53144f3fa4..036f354bf8 100644 --- a/src/rabbit_direct.erl +++ b/src/rabbit_direct.erl @@ -50,7 +50,7 @@ boot() -> rabbit_sup:start_supervisor_child( rabbit_direct_client_sup, rabbit_client_sup, [{local, rabbit_direct_client_sup}, - {rabbit_channel_sup, start_link, []}]). + {{rabbit_channel_sup, start_link, []}, []}]). force_event_refresh() -> [Pid ! force_event_refresh || Pid<- list()], diff --git a/src/rabbit_networking.erl b/src/rabbit_networking.erl index 0a0e51c5db..517fa36032 100644 --- a/src/rabbit_networking.erl +++ b/src/rabbit_networking.erl @@ -139,7 +139,7 @@ boot_ssl() -> start() -> rabbit_sup:start_supervisor_child( rabbit_tcp_client_sup, rabbit_client_sup, [{local, rabbit_tcp_client_sup}, - {rabbit_connection_sup,start_link,[]}]). + {{rabbit_connection_sup,start_link,[]}, []}]). ensure_ssl() -> ok = app_utils:start_applications([crypto, public_key, ssl]), |