ft: 代码优化

include/ntCom.hrl

@@ -2,4 +2,4 @@
 -define(ntWarn(Format, Args), error_logger:warning_msg(Format, Args)).
 -define(ntInfo(Format, Args), error_logger:info_msg(Format, Args)).
 
--define(getLValue(Key, List, Default), ntCom:getListValue(Key, List, Default)).
+-define(ntGLV(Key, List, Default), ntCom:gLV(Key, List, Default)).

src/misc/ntCom.erl

@@ -88,7 +88,7 @@ isIpv6({A, B, C, D, E, F, G, H}) ->
 isIpv6(_) ->
    false.
 
-getListValue(Key, List, Default) ->
+gLV(Key, List, Default) ->
    case lists:keyfind(Key, 1, List) of
       false ->
          Default;

src/proxyPt/ntPptListener.erl

@@ -91,13 +91,13 @@ loop(Parent, State) ->
 }).
 
 init({AptSupName, Port, ListenOpts}) ->
-   TcpOpts = ?getLValue(tcpOpts, ListenOpts, []),
+   TcpOpts = ?ntGLV(tcpOpts, ListenOpts, []),
    %% Don't active the socket...
    case gen_tcp:listen(Port, lists:keystore(active, 1, TcpOpts, {active, false})) of
       {ok, LSock} ->
-         AptCnt = ?getLValue(aptCnt, ListenOpts, ?AptCnt),
-         ConMod = ?getLValue(conMod, ListenOpts, undefined),
-         ConArgs = ?getLValue(conArgs, ListenOpts, undefined),
+         AptCnt = ?ntGLV(aptCnt, ListenOpts, ?AptCnt),
+         ConMod = ?ntGLV(conMod, ListenOpts, undefined),
+         ConArgs = ?ntGLV(conArgs, ListenOpts, undefined),
          startAcceptor(AptCnt, LSock, AptSupName, ConMod, ConArgs),
          {ok, {LAddr, LPort}} = inet:sockname(LSock),
          % ?ntInfo("success to listen on ~p ~n", [Port]),
@@ -118,8 +118,7 @@ handleMsg({'$gen_call', From, miListenPort}, #state{listenPort = LPort} = _State
 handleMsg(_Msg, _State) ->
    kpS.
 
-terminate(Reason, #state{lSock = LSock, listenAddr = Addr, listenPort = Port}) ->
-   ?ntInfo("stopped on ~s:~p ~n", [inet:ntoa(Addr), Port]),
+terminate(Reason, #state{lSock = LSock}) ->
    %% 关闭这个监听LSock  监听进程收到tcp_close 然后终止acctptor进程
    catch port_close(LSock),
    exit(Reason).

src/proxyPt/ntPptMgrSup.erl

@@ -23,10 +23,10 @@ init({SupName, Port, ListenOpts}) ->
    AptSupName = ntCom:asName(ssl, SupName),
    ListenName = ntCom:lsName(ssl, SupName),
 
-   SslOpts = ?getLValue(sslOpts, ListenOpts, undefined),
-   SslHSTet = ?getLValue(sslHSTet, ListenOpts, ?DefSslHSTet),
-   ProxyPt = ?getLValue(proxyPt, ListenOpts, false),
-   ProxyPtTet = ?getLValue(proxyPtTet, ListenOpts, ?DefProxyPtTet),
+   SslOpts = ?ntGLV(sslOpts, ListenOpts, undefined),
+   SslHSTet = ?ntGLV(sslHSTet, ListenOpts, ?DefSslHSTet),
+   ProxyPt = ?ntGLV(proxyPt, ListenOpts, false),
+   ProxyPtTet = ?ntGLV(proxyPtTet, ListenOpts, ?DefProxyPtTet),
 
    ChildSpecs = [
       #{

src/ssl/ntSslListener.erl

@@ -91,13 +91,13 @@ loop(Parent, State) ->
 }).
 
 init({AptSupName, Port, ListenOpts}) ->
-   TcpOpts = ?getLValue(tcpOpts, ListenOpts, []),
+   TcpOpts = ?ntGLV(tcpOpts, ListenOpts, []),
    %% Don't active the socket...
    case gen_tcp:listen(Port, lists:keystore(active, 1, TcpOpts, {active, false})) of
       {ok, LSock} ->
-         AptCnt = ?getLValue(aptCnt, ListenOpts, ?AptCnt),
-         ConMod = ?getLValue(conMod, ListenOpts, undefined),
-         ConArgs = ?getLValue(conArgs, ListenOpts, undefined),
+         AptCnt = ?ntGLV(aptCnt, ListenOpts, ?AptCnt),
+         ConMod = ?ntGLV(conMod, ListenOpts, undefined),
+         ConArgs = ?ntGLV(conArgs, ListenOpts, undefined),
          startAcceptor(AptCnt, LSock, AptSupName, ConMod, ConArgs),
          {ok, {LAddr, LPort}} = inet:sockname(LSock),
          % ?ntInfo("success to listen on ~p ~n", [Port]),
@@ -118,8 +118,7 @@ handleMsg({'$gen_call', From, miListenPort}, #state{listenPort = LPort} = _State
 handleMsg(_Msg, _State) ->
    kpS.
 
-terminate(Reason, #state{lSock = LSock, listenAddr = Addr, listenPort = Port}) ->
-   ?ntInfo("stopped on ~s:~p ~n", [inet:ntoa(Addr), Port]),
+terminate(Reason, #state{lSock = LSock}) ->
    %% 关闭这个监听LSock  监听进程收到tcp_close 然后终止acctptor进程
    catch port_close(LSock),
    exit(Reason).

src/ssl/ntSslMgrSup.erl

@@ -23,8 +23,8 @@ init({SupName, Port, ListenOpts}) ->
    AptSupName = ntCom:asName(ssl, SupName),
    ListenName = ntCom:lsName(ssl, SupName),
 
-   SslOpts = ?getLValue(sslOpts, ListenOpts, []),
-   SslHSTet = ?getLValue(sslHSTet, ListenOpts, ?DefSslHSTet),
+   SslOpts = ?ntGLV(sslOpts, ListenOpts, []),
+   SslHSTet = ?ntGLV(sslHSTet, ListenOpts, ?DefSslHSTet),
 
    ChildSpecs = [
       #{

src/tcp/ntTcpListener.erl

@@ -91,13 +91,13 @@ loop(Parent, State) ->
 }).
 
 init({AptSupName, Port, ListenOpts}) ->
-   TcpOpts = ?getLValue(tcpOpts, ListenOpts, []),
+   TcpOpts = ?ntGLV(tcpOpts, ListenOpts, []),
    %% Don't active the socket...
    case gen_tcp:listen(Port, lists:keystore(active, 1, TcpOpts, {active, false})) of
       {ok, LSock} ->
-         AptCnt = ?getLValue(aptCnt, ListenOpts, ?AptCnt),
-         ConMod = ?getLValue(conMod, ListenOpts, undefined),
-         ConArgs = ?getLValue(conArgs, ListenOpts, undefined),
+         AptCnt = ?ntGLV(aptCnt, ListenOpts, ?AptCnt),
+         ConMod = ?ntGLV(conMod, ListenOpts, undefined),
+         ConArgs = ?ntGLV(conArgs, ListenOpts, undefined),
          startAcceptor(AptCnt, LSock, AptSupName, ConMod, ConArgs),
          {ok, {LAddr, LPort}} = inet:sockname(LSock),
          % ?ntInfo("success to listen on ~p ~n", [Port]),
@@ -118,8 +118,7 @@ handleMsg({'$gen_call', From, miListenPort}, #state{listenPort = LPort} = _State
 handleMsg(_Msg, _State) ->
    kpS.
 
-terminate(Reason, #state{lSock = LSock, listenAddr = Addr, listenPort = Port}) ->
-   ?ntInfo("stopped on ~s:~p ~n", [inet:ntoa(Addr), Port]),
+terminate(Reason, #state{lSock = LSock}) ->
    %% 关闭这个监听LSock  监听进程收到tcp_close 然后终止acctptor进程
    catch port_close(LSock),
    exit(Reason).

src/udp/ntUdpSrv.erl

@@ -96,15 +96,15 @@ loop(Parent, State) ->
 -define(DefUdpOpts, [binary, {reuseaddr, true}]).
 
 init({Port, UoOpts}) ->
-   UdpOpts = ?getLValue(udpOpts, UoOpts, []),
+   UdpOpts = ?ntGLV(udpOpts, UoOpts, []),
    LastUdpOpts = ntCom:mergeOpts(?DefUdpOpts, UdpOpts),
    %% Don't active the socket...
    case gen_udp:open(Port, lists:keystore(active, 1, LastUdpOpts, {active, false})) of
       {ok, OSock} ->
-         AptCnt = ?getLValue(aptCnt, UoOpts, ?AptCnt),
-         ConMod = ?getLValue(conMod, UoOpts, undefined),
+         AptCnt = ?ntGLV(aptCnt, UoOpts, ?AptCnt),
+         ConMod = ?ntGLV(conMod, UoOpts, undefined),
          {ok, {LAddr, LPort}} = inet:sockname(OSock),
-         ?ntInfo("success to open on ~p ~p ~n", [LAddr, LPort]),
+         % ?ntInfo("success to open on ~p ~p ~n", [LAddr, LPort]),
          ok = inet:setopts(OSock, [{active, 100}]),
          {ok, #state{listenAddr = LAddr, listenPort = LPort, oSock = OSock, conMod = ConMod, opts = [{acceptors, AptCnt}, {tcpOpts, LastUdpOpts}]}};
       {error, Reason} ->
@@ -174,8 +174,7 @@ handleMsg(_Msg, _State) ->
    ?ntErr("~p unexpected info: ~p ~n", [?MODULE, _Msg]),
    kpS.
 
-terminate(Reason, #state{oSock = LSock, listenAddr = Addr, listenPort = Port}) ->
-   ?ntInfo("stopped on ~s:~p ~n", [inet:ntoa(Addr), Port]),
+terminate(Reason, #state{oSock = LSock}) ->
    catch gen_udp:close(LSock),
    exit(Reason).