fix tcp_server
This commit is contained in:
parent
b30a8a91df
commit
067ead0f60
@ -37,6 +37,24 @@ init([]) ->
|
|||||||
% modules => ['efka_agent']
|
% modules => ['efka_agent']
|
||||||
%},
|
%},
|
||||||
|
|
||||||
|
#{
|
||||||
|
id => 'efka_tcp_sup',
|
||||||
|
start => {'efka_tcp_sup', start_link, []},
|
||||||
|
restart => permanent,
|
||||||
|
shutdown => 2000,
|
||||||
|
type => supervisor,
|
||||||
|
modules => ['efka_tcp_sup']
|
||||||
|
},
|
||||||
|
|
||||||
|
#{
|
||||||
|
id => 'efka_tcp_server',
|
||||||
|
start => {'efka_tcp_server', start_link, [18080]},
|
||||||
|
restart => permanent,
|
||||||
|
shutdown => 2000,
|
||||||
|
type => worker,
|
||||||
|
modules => ['efka_tcp_server']
|
||||||
|
},
|
||||||
|
|
||||||
#{
|
#{
|
||||||
id => 'efka_server_sup',
|
id => 'efka_server_sup',
|
||||||
start => {'efka_server_sup', start_link, []},
|
start => {'efka_server_sup', start_link, []},
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
%%% @end
|
%%% @end
|
||||||
%%% Created : 10. 12月 2020 上午11:17
|
%%% Created : 10. 12月 2020 上午11:17
|
||||||
%%%-------------------------------------------------------------------
|
%%%-------------------------------------------------------------------
|
||||||
-module(tcp_channel).
|
-module(efka_tcp_channel).
|
||||||
-author("licheng5").
|
-author("licheng5").
|
||||||
-behaviour(gen_server).
|
-behaviour(gen_server).
|
||||||
|
|
||||||
@ -14,13 +14,12 @@
|
|||||||
-define(PING_TICKER, 15000).
|
-define(PING_TICKER, 15000).
|
||||||
|
|
||||||
%% API
|
%% API
|
||||||
-export([start_link/2]).
|
-export([start_link/1]).
|
||||||
-export([publish_command/4, send_event/3, stop/2, move_network/3]).
|
-export([publish_command/4, send_event/3, stop/2, move_network/3]).
|
||||||
|
|
||||||
-export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]).
|
-export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]).
|
||||||
|
|
||||||
-record(state, {
|
-record(state, {
|
||||||
transport,
|
|
||||||
socket,
|
socket,
|
||||||
%% 标记是否已经注册
|
%% 标记是否已经注册
|
||||||
is_registered = false,
|
is_registered = false,
|
||||||
@ -62,19 +61,15 @@ stop(Pid, Reason) when is_pid(Pid) ->
|
|||||||
%% esockd callback
|
%% esockd callback
|
||||||
%%--------------------------------------------------------------------
|
%%--------------------------------------------------------------------
|
||||||
|
|
||||||
start_link(Transport, Sock) ->
|
start_link(Socket) ->
|
||||||
{ok, proc_lib:spawn_link(?MODULE, init, [[Transport, Sock]])}.
|
{ok, proc_lib:spawn_link(?MODULE, init, [Socket])}.
|
||||||
|
|
||||||
|
init(Socket) ->
|
||||||
|
efka_logger:debug("[sdlan_channel] get a new connection: ~p", [Socket]),
|
||||||
|
ok = inet:setopts(Socket, [{active, true}, {packet, 4}]),
|
||||||
|
|
||||||
init([Transport, Sock]) ->
|
|
||||||
efka_logger:debug("[sdlan_channel] get a new connection: ~p", [Sock]),
|
|
||||||
case Transport:wait(Sock) of
|
|
||||||
{ok, NewSock} ->
|
|
||||||
Transport:setopts(Sock, [{active, true}]),
|
|
||||||
erlang:start_timer(?PING_TICKER, self(), ping_ticker),
|
erlang:start_timer(?PING_TICKER, self(), ping_ticker),
|
||||||
gen_server:enter_loop(?MODULE, [], #state{transport = Transport, socket = NewSock});
|
gen_server:enter_loop(?MODULE, [], #state{socket = Socket}).
|
||||||
{error, Reason} ->
|
|
||||||
{stop, Reason}
|
|
||||||
end.
|
|
||||||
|
|
||||||
handle_call(_Request, _From, State) ->
|
handle_call(_Request, _From, State) ->
|
||||||
{reply, ok, State}.
|
{reply, ok, State}.
|
||||||
43
apps/efka/src/efka_tcp_server.erl
Normal file
43
apps/efka/src/efka_tcp_server.erl
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
%%%-------------------------------------------------------------------
|
||||||
|
%%% @author anlicheng
|
||||||
|
%%% @copyright (C) 2025, <COMPANY>
|
||||||
|
%%% @doc
|
||||||
|
%%%
|
||||||
|
%%% @end
|
||||||
|
%%% Created : 29. 4月 2025 23:24
|
||||||
|
%%%-------------------------------------------------------------------
|
||||||
|
-module(efka_tcp_server).
|
||||||
|
-author("anlicheng").
|
||||||
|
|
||||||
|
%% API
|
||||||
|
-export([start_link/1, init/1]).
|
||||||
|
|
||||||
|
start_link(Port) ->
|
||||||
|
{ok, spawn_link(?MODULE, init, [Port])}.
|
||||||
|
|
||||||
|
%% 监听循环
|
||||||
|
init(Port) ->
|
||||||
|
case gen_tcp:listen(Port, [binary, {active, false}, {reuseaddr, true}]) of
|
||||||
|
{ok, ListenSocket} ->
|
||||||
|
efka_logger:debug("Server started on port ~p~n", [Port]),
|
||||||
|
main_loop(ListenSocket);
|
||||||
|
{error, Reason} ->
|
||||||
|
efka_logger:debug("Failed to start server: ~p~n", [Reason]),
|
||||||
|
exit(Reason)
|
||||||
|
end.
|
||||||
|
|
||||||
|
main_loop(ListenSocket) ->
|
||||||
|
case gen_tcp:accept(ListenSocket) of
|
||||||
|
{ok, Socket} ->
|
||||||
|
efka_logger:debug("New client connected: ~p~n", [Socket]),
|
||||||
|
% 为每个新连接生成一个处理进程
|
||||||
|
efka_tcp_sup:start_child(Socket),
|
||||||
|
% 继续监听下一个连接
|
||||||
|
main_loop(ListenSocket);
|
||||||
|
{error, closed} ->
|
||||||
|
efka_logger:debug("Server socket closed~n", []),
|
||||||
|
exit(tcp_closed);
|
||||||
|
{error, Reason} ->
|
||||||
|
efka_logger:debug("Accept error: ~p~n", [Reason]),
|
||||||
|
exit(Reason)
|
||||||
|
end.
|
||||||
44
apps/efka/src/efka_tcp_sup.erl
Normal file
44
apps/efka/src/efka_tcp_sup.erl
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
%%%-------------------------------------------------------------------
|
||||||
|
%% @doc efka top level supervisor.
|
||||||
|
%% @end
|
||||||
|
%%%-------------------------------------------------------------------
|
||||||
|
|
||||||
|
-module(efka_tcp_sup).
|
||||||
|
|
||||||
|
-behaviour(supervisor).
|
||||||
|
|
||||||
|
-export([start_link/0, start_child/1]).
|
||||||
|
|
||||||
|
-export([init/1]).
|
||||||
|
|
||||||
|
-define(SERVER, ?MODULE).
|
||||||
|
|
||||||
|
start_link() ->
|
||||||
|
supervisor:start_link({local, ?SERVER}, ?MODULE, []).
|
||||||
|
|
||||||
|
%% sup_flags() = #{strategy => strategy(), % optional
|
||||||
|
%% intensity => non_neg_integer(), % optional
|
||||||
|
%% period => pos_integer()} % optional
|
||||||
|
%% child_spec() = #{id => child_id(), % mandatory
|
||||||
|
%% start => mfargs(), % mandatory
|
||||||
|
%% restart => restart(), % optional
|
||||||
|
%% shutdown => shutdown(), % optional
|
||||||
|
%% type => worker(), % optional
|
||||||
|
%% modules => modules()} % optional
|
||||||
|
init([]) ->
|
||||||
|
SupFlags = #{strategy => one_for_one, intensity => 1000, period => 3600},
|
||||||
|
{ok, {SupFlags, []}}.
|
||||||
|
|
||||||
|
%% internal functions
|
||||||
|
|
||||||
|
start_child(Socket) ->
|
||||||
|
supervisor:start_child(?MODULE, #{
|
||||||
|
id => make_ref(),
|
||||||
|
start => {efka_tcp_channel, start_link, [Socket]},
|
||||||
|
restart => permanent,
|
||||||
|
shutdown => 2000,
|
||||||
|
type => worker,
|
||||||
|
modules => ['efka_tcp_channel']
|
||||||
|
}).
|
||||||
|
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user