diff --git a/server/src/proto_sup.erl b/server/src/proto_sup.erl index b2a2e12..7149757 100644 --- a/server/src/proto_sup.erl +++ b/server/src/proto_sup.erl @@ -14,5 +14,10 @@ init([Port, CertDir]) -> SupFlags = #{stragegy => one_for_all, intensity => 1, period => 5}, - ChildSpecs = [tcp_server:child_spec(Port, CertDir)], + ChildSpecs = [#{id => tcp_server, + start => {tcp_server, start_link, [Port, CertDir]}, + restart => permanent, + shutdown => 5000, + type => worker, + modules => [tcp_server]}], {ok, {SupFlags, ChildSpecs}}. diff --git a/server/src/tcp_server.erl b/server/src/tcp_server.erl index 66128b9..2714c29 100644 --- a/server/src/tcp_server.erl +++ b/server/src/tcp_server.erl @@ -4,7 +4,7 @@ -module(tcp_server). -behaviour(gen_server). --export([start_link/2, child_spec/2]). +-export([start_link/2]). -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]). @@ -13,14 +13,6 @@ start_link(Port, CertDir) -> gen_server:start_link({local, ?MODULE}, ?MODULE, [Port, CertDir], []). -child_spec(Port, CertDir) -> - #{id => ?MODULE, - start => {?MODULE, start_link, [Port, CertDir]}, - restart => permanent, - shutdown => 5000, - type => worker, - modules => [?MODULE]}. - init([Port, CertDir]) -> SslOpts = [{certfile, filename:join([CertDir, "server.pem"])}, {cacertfile, filename:join([CertDir, "ca.pem"])},