aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/src/inets_app
diff options
context:
space:
mode:
authorJay Nelson <[email protected]>2012-03-05 20:06:14 -0800
committerJay Nelson <[email protected]>2012-03-05 20:06:14 -0800
commit7b9b7c1cc416b0d5b1f2d5223ca5e012ddce0ea7 (patch)
treeb9dcb83dc003f7289930717d36cf98436914b886 /lib/inets/src/inets_app
parent1bc4f4c35876a8dcccad66129e68f602751f6e36 (diff)
downloadotp-7b9b7c1cc416b0d5b1f2d5223ca5e012ddce0ea7.tar.gz
otp-7b9b7c1cc416b0d5b1f2d5223ca5e012ddce0ea7.tar.bz2
otp-7b9b7c1cc416b0d5b1f2d5223ca5e012ddce0ea7.zip
Add inets_sup:start_link/0
inets_app calls supervisor:start_link/3 directly rather than calling the root supervisor function inets_sup:start_link/0. This precludes using included_applications to start inets without having a wrapper function. This patch makes inets_app follow the standard OTP application structure.
Diffstat (limited to 'lib/inets/src/inets_app')
-rw-r--r--lib/inets/src/inets_app/inets_app.erl2
-rw-r--r--lib/inets/src/inets_app/inets_sup.erl10
2 files changed, 11 insertions, 1 deletions
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([]) ->