diff options
| author | Micael Karlberg <[email protected]> | 2012-03-06 11:35:53 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2012-03-06 11:35:53 +0100 |
| commit | 96a9bdbb00a710b416d3cab4614d6ae37bb9b359 (patch) | |
| tree | 602cffdeb684a44f3749c00d0f3fcf92db84b623 /lib | |
| parent | c864dc812dc853e101714185b56295a3f314ed01 (diff) | |
| parent | 7b9b7c1cc416b0d5b1f2d5223ca5e012ddce0ea7 (diff) | |
| download | otp-96a9bdbb00a710b416d3cab4614d6ae37bb9b359.tar.gz otp-96a9bdbb00a710b416d3cab4614d6ae37bb9b359.tar.bz2 otp-96a9bdbb00a710b416d3cab4614d6ae37bb9b359.zip | |
Merge branch 'jn/inets_sup_start_link' into bmk/inets/inets59_integration2
Also updated appup file accordingly.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/inets/src/inets_app/inets.appup.src | 12 | ||||
| -rw-r--r-- | lib/inets/src/inets_app/inets_app.erl | 2 | ||||
| -rw-r--r-- | lib/inets/src/inets_app/inets_sup.erl | 10 |
3 files changed, 23 insertions, 1 deletions
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src index 3bc7d69101..d36fcf87d4 100644 --- a/lib/inets/src/inets_app/inets.appup.src +++ b/lib/inets/src/inets_app/inets.appup.src @@ -20,6 +20,9 @@ [ {"5.8.1", [ + {load_module, inets_app, soft_purge, soft_purge, [inets_sup]}, + {update, inets_sup, soft, soft_purge, soft_purge, []}, + {load_module, httpd_conf, soft_purge, soft_purge, []}, {load_module, httpd_response, soft_purge, soft_purge, []}, {load_module, httpd_script_env, soft_purge, soft_purge, []}, @@ -32,6 +35,9 @@ }, {"5.8", [ + {load_module, inets_app, soft_purge, soft_purge, [inets_sup]}, + {update, inets_sup, soft, soft_purge, soft_purge, []}, + {load_module, inets, soft_purge, soft_purge, [inets_trace]}, {load_module, httpd_conf, soft_purge, soft_purge, []}, @@ -57,6 +63,9 @@ [ {"5.8.1", [ + {load_module, inets_app, soft_purge, soft_purge, [inets_sup]}, + {update, inets_sup, soft, soft_purge, soft_purge, []}, + {load_module, httpd_conf, soft_purge, soft_purge, []}, {load_module, httpd_response, soft_purge, soft_purge, []}, {load_module, httpd_script_env, soft_purge, soft_purge, []}, @@ -69,6 +78,9 @@ }, {"5.8", [ + {load_module, inets_app, soft_purge, soft_purge, [inets_sup]}, + {update, inets_sup, soft, soft_purge, soft_purge, []}, + {load_module, inets, soft_purge, soft_purge, []}, {load_module, httpd_conf, soft_purge, soft_purge, []}, diff --git a/lib/inets/src/inets_app/inets_app.erl b/lib/inets/src/inets_app/inets_app.erl index cae79a6767..77c39d85eb 100644 --- a/lib/inets/src/inets_app/inets_app.erl +++ b/lib/inets/src/inets_app/inets_app.erl @@ -24,7 +24,7 @@ -export([start/2, stop/1]). start(_Type, _State) -> - supervisor:start_link({local, inets_sup}, inets_sup, []). + inets_sup:start_link(). stop(_State) -> ok. diff --git a/lib/inets/src/inets_app/inets_sup.erl b/lib/inets/src/inets_app/inets_sup.erl index 20d5ef343e..0382362778 100644 --- a/lib/inets/src/inets_app/inets_sup.erl +++ b/lib/inets/src/inets_app/inets_sup.erl @@ -25,9 +25,19 @@ -behaviour(supervisor). +%% External API +-export([start_link/0]). + +%% Supervisor callbacks -export([init/1]). %%%========================================================================= +%%% External functions +%%%========================================================================= +start_link() -> + supervisor:start_link({local, ?MODULE}, ?MODULE, []). + +%%%========================================================================= %%% Supervisor callback %%%========================================================================= init([]) -> |