Skip to content

Commit

Permalink
Rename bookish_spork_sup --> bookish_spork_acceptor_sup
Browse files Browse the repository at this point in the history
  • Loading branch information
tank-bohr committed Nov 21, 2019
1 parent c3f606d commit f67ebdb
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 15 deletions.
18 changes: 5 additions & 13 deletions src/bookish_spork_sup.erl → src/bookish_spork_acceptor_sup.erl
@@ -1,29 +1,21 @@
-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,
intensity => 5,
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, [
Expand Down
4 changes: 2 additions & 2 deletions src/bookish_spork_server.erl
Expand Up @@ -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}}.
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit f67ebdb

Please sign in to comment.