From f67ebdbc95340f2ee0c7c8f4012f43f529af828d Mon Sep 17 00:00:00 2001 From: Alexey Nikitin Date: Fri, 22 Nov 2019 02:42:51 +0300 Subject: [PATCH] Rename bookish_spork_sup --> bookish_spork_acceptor_sup --- ..._sup.erl => bookish_spork_acceptor_sup.erl} | 18 +++++------------- src/bookish_spork_server.erl | 4 ++-- 2 files changed, 7 insertions(+), 15 deletions(-) rename src/{bookish_spork_sup.erl => bookish_spork_acceptor_sup.erl} (58%) diff --git a/src/bookish_spork_sup.erl b/src/bookish_spork_acceptor_sup.erl similarity index 58% rename from src/bookish_spork_sup.erl rename to src/bookish_spork_acceptor_sup.erl index 28c717f..039e46f 100644 --- a/src/bookish_spork_sup.erl +++ b/src/bookish_spork_acceptor_sup.erl @@ -1,13 +1,8 @@ --module(bookish_spork_sup). --export([ - start_acceptor_sup/2, - stop/1 -]). +-module(bookish_spork_acceptor_sup). +-export([start_link/2]). -behaviour(supervisor). --export([ - init/1 -]). +-export([init/1]). -define(SUP_FLAGS, #{ strategy => one_for_one, @@ -15,15 +10,12 @@ period => 10 }). --spec start_acceptor_sup(Server, ListenSocket) -> {ok, pid()} when +-spec start_link(Server, ListenSocket) -> {ok, pid()} when Server :: pid(), ListenSocket :: bookish_spork_transport:listen(). -start_acceptor_sup(Server, ListenSocket) -> +start_link(Server, ListenSocket) -> supervisor:start_link(?MODULE, [Server, ListenSocket]). -stop(Sup) -> - ok = gen_server:stop(Sup). - %% @private init(Args) -> {ok, {?SUP_FLAGS, [ diff --git a/src/bookish_spork_server.erl b/src/bookish_spork_server.erl index c64d4c4..ef92393 100644 --- a/src/bookish_spork_server.erl +++ b/src/bookish_spork_server.erl @@ -80,7 +80,7 @@ init(Options) -> Port = proplists:get_value(port, Options, ?DEFAULT_PORT), Mod = detect_transport(Options), ListenSocket = bookish_spork_transport:listen(Mod, Port), - {ok, AcceptorSup} = bookish_spork_sup:start_acceptor_sup(self(), ListenSocket), + {ok, AcceptorSup} = bookish_spork_acceptor_sup:start_link(self(), ListenSocket), {ok, RequestQueuePid} = bookish_spork_blocking_queue:start_link(), {ok, #state{request_queue = RequestQueuePid, listen_socket = ListenSocket, acceptor_sup = AcceptorSup}}. @@ -126,7 +126,7 @@ terminate(_Reason, State) -> listen_socket = ListenSocket, acceptor_sup = AcceptorSup } = State, - ok = bookish_spork_sup:stop(AcceptorSup), + ok = gen_server:stop(AcceptorSup), ok = bookish_spork_transport:close(ListenSocket). %% @private