diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2013-04-04 16:47:29 +0100 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2013-04-04 16:47:29 +0100 |
| commit | 541d6950bb76846bcd2f759a2461b0cc29d92bae (patch) | |
| tree | 145ed87986dacb14d2c48eeb69b9a162d7fbbd8a | |
| parent | 9bacf2cffe11c2663570d5be6b27a75ee34e835c (diff) | |
| download | rabbitmq-server-git-541d6950bb76846bcd2f759a2461b0cc29d92bae.tar.gz | |
Change client_sup API
| -rw-r--r-- | src/rabbit_client_sup.erl | 24 | ||||
| -rw-r--r-- | src/rabbit_direct.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_networking.erl | 2 |
3 files changed, 15 insertions, 13 deletions
diff --git a/src/rabbit_client_sup.erl b/src/rabbit_client_sup.erl index 54bb8671b3..1a15b0cbe0 100644 --- a/src/rabbit_client_sup.erl +++ b/src/rabbit_client_sup.erl @@ -18,7 +18,7 @@ -behaviour(supervisor2). --export([start_link/1, start_link/2]). +-export([start_link/1, start_link/2, start_link/3]). -export([init/1]). @@ -37,16 +37,18 @@ %%---------------------------------------------------------------------------- -start_link(CallbackOpts) -> - supervisor2:start_link(?MODULE, CallbackOpts). +start_link(Callback) -> + supervisor2:start_link(?MODULE, Callback). -start_link(SupName, CallbackOpts) -> - supervisor2:start_link(SupName, ?MODULE, CallbackOpts). +start_link(SupName, Callback) -> + supervisor2:start_link(SupName, ?MODULE, Callback). -init({{M,F,A},Opts}) -> - {Shutdown, Type} = case rabbit_misc:pget(worker_type, Opts, supervisor) of - supervisor -> {infinity, supervisor}; - worker -> {?MAX_WAIT, worker} - end, +start_link(SupName, Callback, worker) -> + supervisor2:start_link(SupName, ?MODULE, {Callback, worker}). + +init({M,F,A}) -> + {ok, {{simple_one_for_one_terminate, 0, 1}, + [{client, {M,F,A}, temporary, infinity, supervisor, [M]}]}}; +init({{M,F,A}, worker}) -> {ok, {{simple_one_for_one_terminate, 0, 1}, - [{client, {M,F,A}, temporary, Shutdown, Type, [M]}]}}. + [{client, {M,F,A}, temporary, ?MAX_WAIT, worker, [M]}]}}. diff --git a/src/rabbit_direct.erl b/src/rabbit_direct.erl index 036f354bf8..53144f3fa4 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 517fa36032..0a0e51c5db 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]), |