From e4da6956fceea1af8e2cdf9fece0e014576ab43c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= <essen@dev-extend.eu>
Date: Sat, 2 Apr 2011 20:27:16 +0200
Subject: Anonymize and improve the cowboy supervision tree.

* Cowboy isn't an OTP application anymore; just a supervisor.
* All processes started by Cowboy are now anonymous.
* All processes related to a listener are now part of its supervision tree.
---
 src/cowboy_listener_sup.erl | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

(limited to 'src/cowboy_listener_sup.erl')

diff --git a/src/cowboy_listener_sup.erl b/src/cowboy_listener_sup.erl
index 3c8b3c2..85b17ef 100644
--- a/src/cowboy_listener_sup.erl
+++ b/src/cowboy_listener_sup.erl
@@ -26,8 +26,7 @@
 start_link(NbAcceptors, Transport, TransOpts, Protocol, ProtoOpts) ->
 	case Transport:listen(TransOpts) of
 		{ok, LSocket} ->
-			supervisor:start_link(?MODULE, [LSocket,
-				NbAcceptors, Transport, Protocol, ProtoOpts]);
+			start_sup(LSocket, NbAcceptors, Transport, Protocol, ProtoOpts);
 		{error, Reason} ->
 			{error, Reason}
 	end.
@@ -35,9 +34,22 @@ start_link(NbAcceptors, Transport, TransOpts, Protocol, ProtoOpts) ->
 %% supervisor.
 
 %% @todo These specs should be improved.
--spec init(list(term())) -> term().
-init([LSocket, NbAcceptors, Transport, Protocol, ProtoOpts]) ->
-	Procs = [{{acceptor, self(), N}, {cowboy_acceptor, start_link,
-		[LSocket, Transport, Protocol, ProtoOpts]}, permanent,
-		brutal_kill, worker, dynamic} || N <- lists:seq(1, NbAcceptors)],
-	{ok, {{one_for_one, 10, 10}, Procs}}.
+-spec init([]) -> term().
+init([]) ->
+	{ok, {{one_for_one, 0, 1}, []}}.
+
+%% Internal.
+
+-spec start_sup(NbAcceptors::non_neg_integer(), Transport::module(),
+	TransOpts::term(), Protocol::module(), ProtoOpts::term())
+	-> {ok, Pid::pid()}.
+start_sup(LSocket, NbAcceptors, Transport, Protocol, ProtoOpts) ->
+	{ok, SupPid} = supervisor:start_link(?MODULE, []),
+	{ok, ReqsPid} = supervisor:start_child(SupPid,
+		{cowboy_requests_sup, {cowboy_requests_sup, start_link, []},
+		 permanent, 5000, supervisor, [cowboy_requests_sup]}),
+	{ok, _PoolPid} = supervisor:start_child(SupPid,
+		{cowboy_acceptors_sup, {cowboy_acceptors_sup, start_link, [
+			LSocket, NbAcceptors, Transport, Protocol, ProtoOpts, ReqsPid
+		]}, permanent, 5000, supervisor, [cowboy_acceptors_sup]}),
+	{ok, SupPid}.
-- 
cgit v1.2.3