From 2394db892c4bc4a2bee044d93f85bba3667ba70c Mon Sep 17 00:00:00 2001 From: anlicheng <244108715@qq.com> Date: Thu, 15 Jan 2026 16:04:57 +0800 Subject: [PATCH] remove lager --- apps/sdlan/src/dns_proxy/dns_cache.erl | 2 +- apps/sdlan/src/dns_proxy/dns_handler.erl | 20 +++--- apps/sdlan/src/dns_proxy/dns_resolver.erl | 2 +- apps/sdlan/src/dns_proxy/dns_server.erl | 6 +- apps/sdlan/src/dns_proxy/dns_utils.erl | 2 +- apps/sdlan/src/http_handler/api_handler.erl | 2 +- apps/sdlan/src/http_handler/http_protocol.erl | 4 +- .../src/http_handler/network_handler.erl | 8 +-- apps/sdlan/src/http_handler/node_handler.erl | 2 +- apps/sdlan/src/http_handler/test_handler.erl | 4 +- apps/sdlan/src/mnesia/client_model.erl | 4 +- apps/sdlan/src/mysql/mysql_provider.erl | 26 +++---- apps/sdlan/src/sdlan.app.src | 1 - apps/sdlan/src/sdlan_app.erl | 4 +- apps/sdlan/src/sdlan_channel.erl | 68 +++++++++---------- apps/sdlan/src/sdlan_cipher.erl | 2 +- apps/sdlan/src/sdlan_network.erl | 26 +++---- apps/sdlan/src/sdlan_network_coordinator.erl | 4 +- apps/sdlan/src/sdlan_stun.erl | 16 ++--- apps/sdlan/src/test/sdlan_udp_wget.erl | 2 +- apps/sdlan/src/test/stun_client.erl | 18 ++--- 21 files changed, 111 insertions(+), 112 deletions(-) diff --git a/apps/sdlan/src/dns_proxy/dns_cache.erl b/apps/sdlan/src/dns_proxy/dns_cache.erl index da597c0..98383a4 100644 --- a/apps/sdlan/src/dns_proxy/dns_cache.erl +++ b/apps/sdlan/src/dns_proxy/dns_cache.erl @@ -41,7 +41,7 @@ insert(#dns_query{name = Qname, type = QType, class = QClass}, true -> TTL = lists:min(TTLs), ExpireAt = os:system_time(second) + TTL, - lager:debug("min ttl is: ~p, expire_at: ~p", [TTL, ExpireAt]), + logger:debug("min ttl is: ~p, expire_at: ~p", [TTL, ExpireAt]), Key = {Qname, QType, QClass}, Cache = #dns_cache{ key = Key, diff --git a/apps/sdlan/src/dns_proxy/dns_handler.erl b/apps/sdlan/src/dns_proxy/dns_handler.erl index d889ee2..b1011ba 100644 --- a/apps/sdlan/src/dns_proxy/dns_handler.erl +++ b/apps/sdlan/src/dns_proxy/dns_handler.erl @@ -82,10 +82,10 @@ handle_cast({handle_ip_packet, Sock, SrcIp, SrcPort, IpPacket}, State) -> RespIpPacket = build_ip_packet(ReqDAddr, ReqSAddr, ReqDPort, ReqSPort, DnsResp), gen_udp:send(Sock, SrcIp, SrcPort, RespIpPacket); {error, Reason} -> - lager:notice("[dns_handler] resolver get error: ~p", [Reason]) + logger:notice("[dns_handler] resolver get error: ~p", [Reason]) end; false -> - lager:notice("[dns_handler] resolver invalid protocol: ~p", [Protocol]) + logger:notice("[dns_handler] resolver invalid protocol: ~p", [Protocol]) end, {stop, normal, State}. @@ -146,45 +146,45 @@ resolver0(Packet, QueryMsg = #dns_message{qc = 1, questions = [Question = #dns_q authority = [], additional = [] }, - lager:debug("[dns_handler] punchnet inbuilt qnanme: ~p, ip: ~p", [QName, Ip]), + logger:debug("[dns_handler] punchnet inbuilt qnanme: ~p, ip: ~p", [QName, Ip]), {ok, dns:encode_message(RespMsg)}; error -> %% 是否命中内部的域名后缀 EmptyDnsResp = dns:encode_message(build_nxdomain_response(QueryMsg)), case sdlan_domain_regedit:maybe_domain(QName) of true -> - lager:debug("[dns_handler] punchnet inbuilt qnanme: ~p, nxdomain", [QName]), + logger:debug("[dns_handler] punchnet inbuilt qnanme: ~p, nxdomain", [QName]), {ok, EmptyDnsResp}; false -> case dns_cache:lookup(Question) of {hit, Cache} -> - lager:debug("[dns_handler] qname: ~p, hit cache answers: ~p", [QName, Cache#dns_cache.answers]), + logger:debug("[dns_handler] qname: ~p, hit cache answers: ~p", [QName, Cache#dns_cache.answers]), RespMsg = build_response(QueryMsg, Cache), {ok, dns:encode_message(RespMsg)}; miss -> Ref = make_ref(), forward_to_upstream(Ref, Packet, QueryMsg), - lager:debug("[dns_handler] cache is miss, forward_to_upstream"), + logger:debug("[dns_handler] cache is miss, forward_to_upstream"), receive {dns_resolver_reply, Ref, Resp} -> case dns:decode_message(Resp) of RespMsg = #dns_message{answers = Answers} -> - lager:debug("[dns_handler] get a response answers: ~p", [Answers]), + logger:debug("[dns_handler] get a response answers: ~p", [Answers]), dns_cache:insert(Question, RespMsg), {ok, Resp}; Error -> - lager:debug("[dns_handler] parse reply get error: ~p", [Error]), + logger:debug("[dns_handler] parse reply get error: ~p", [Error]), {ok, EmptyDnsResp} end after 5000 -> - lager:debug("[dns_handler] forward_to_upstream timeout"), + logger:debug("[dns_handler] forward_to_upstream timeout"), {ok, EmptyDnsResp} end end end end; resolver0(_, Error) -> - lager:warning("[dns_handler] decode dns_query get error: ~p", [Error]), + logger:warning("[dns_handler] decode dns_query get error: ~p", [Error]), {error, Error}. -spec forward_to_upstream(Ref :: reference(), Request :: binary(), QueryMsg :: #dns_message{}) -> no_return(). diff --git a/apps/sdlan/src/dns_proxy/dns_resolver.erl b/apps/sdlan/src/dns_proxy/dns_resolver.erl index 7058800..05ca163 100644 --- a/apps/sdlan/src/dns_proxy/dns_resolver.erl +++ b/apps/sdlan/src/dns_proxy/dns_resolver.erl @@ -81,7 +81,7 @@ handle_cast({forward, ReceiverPid, Ref, Request, #dns_message{id = TxId, questio lists:foreach(fun({DnsIp, DnsPort}) -> ok = gen_udp:send(Socket, DnsIp, DnsPort, Request), Key = {Idx, TxId, DnsIp, DnsPort, QName, QType, QClass}, - lager:debug("[dns_resolver] key: ~p, send to: ~p, packet: ~p", [Key, {DnsIp, DnsPort}, Request]), + logger:debug("[dns_resolver] key: ~p, send to: ~p, packet: ~p", [Key, {DnsIp, DnsPort}, Request]), dns_pending_wheel:insert(Key, {Ref, ReceiverPid}) end, DnsServers), diff --git a/apps/sdlan/src/dns_proxy/dns_server.erl b/apps/sdlan/src/dns_proxy/dns_server.erl index d624a77..228f2c4 100644 --- a/apps/sdlan/src/dns_proxy/dns_server.erl +++ b/apps/sdlan/src/dns_proxy/dns_server.erl @@ -7,18 +7,18 @@ start_link(Port) when is_integer(Port) -> init(Port) -> dns_cache:init(), {ok, Sock} = gen_udp:open(Port, [binary, {active, true}]), - lager:debug("[dns_server] DNS Forwarder started on UDP port ~p~n", [Port]), + logger:debug("[dns_server] DNS Forwarder started on UDP port ~p~n", [Port]), loop(Sock). loop(Sock) -> receive {udp, Sock, Ip, Port, Packet} -> - lager:debug("[dns_server] ip: ~p, get a packet: ~p", [{Ip, Port}, Packet]), + logger:debug("[dns_server] ip: ~p, get a packet: ~p", [{Ip, Port}, Packet]), case dns_handler_sup:start_handler() of {ok, HandlerPid} -> dns_handler:handle_ip_packet(HandlerPid, Sock, Ip, Port, Packet); Error -> - lager:debug("[dns_server] start handler get error: ~p", [Error]) + logger:debug("[dns_server] start handler get error: ~p", [Error]) end, loop(Sock) end. \ No newline at end of file diff --git a/apps/sdlan/src/dns_proxy/dns_utils.erl b/apps/sdlan/src/dns_proxy/dns_utils.erl index 2d07524..3dc81e6 100644 --- a/apps/sdlan/src/dns_proxy/dns_utils.erl +++ b/apps/sdlan/src/dns_proxy/dns_utils.erl @@ -126,6 +126,6 @@ test() -> X = udp_checksum(SAddr, DAddr, SPort, DPort, UDPPayload), - lager:debug("ip_sum: ~p, =: ~p, udp: ~p, checkSum: ~p, =: ~p", [IpSum, ip_checksum(IPPacket), UDP, CheckSum, X]), + logger:debug("ip_sum: ~p, =: ~p, udp: ~p, checkSum: ~p, =: ~p", [IpSum, ip_checksum(IPPacket), UDP, CheckSum, X]), dns:decode_message(UDPPayload). \ No newline at end of file diff --git a/apps/sdlan/src/http_handler/api_handler.erl b/apps/sdlan/src/http_handler/api_handler.erl index 5c89df2..2d2b6d2 100644 --- a/apps/sdlan/src/http_handler/api_handler.erl +++ b/apps/sdlan/src/http_handler/api_handler.erl @@ -18,7 +18,7 @@ %% 重新加载对应的主机信息 handle_request("POST", "/test/auth_token", _, PostParams) -> - lager:debug("[test_handler] get post params: ~p", [PostParams]), + logger:debug("[test_handler] get post params: ~p", [PostParams]), [Id | _] = network_bo:get_all_networks(), Data = #{ <<"network_id">> => Id diff --git a/apps/sdlan/src/http_handler/http_protocol.erl b/apps/sdlan/src/http_handler/http_protocol.erl index 2de5748..231eb60 100644 --- a/apps/sdlan/src/http_handler/http_protocol.erl +++ b/apps/sdlan/src/http_handler/http_protocol.erl @@ -21,7 +21,7 @@ init(Req0, Opts = [Mod|_]) -> try Mod:handle_request(Method, Path, GetParams, PostParams) of {ok, StatusCode, Resp} -> - %lager:debug("[http_protocol] request path: ~p, get_params: ~p, post_params: ~p, response: ~ts", + %logger:debug("[http_protocol] request path: ~p, get_params: ~p, post_params: ~p, response: ~ts", % [Path, GetParams, PostParams, Resp]), AcceptEncoding = cowboy_req:header(<<"accept-encoding">>, Req1, <<>>), Req2 = case iolist_size(Resp) >= 1024 andalso supported_gzip(AcceptEncoding) of @@ -44,7 +44,7 @@ init(Req0, Opts = [Mod|_]) -> }, Error, Req1), {ok, Req2, Opts}; _:Error:Stack -> - lager:warning("[http_handler] get error: ~p, stack: ~p", [Error, Stack]), + logger:warning("[http_handler] get error: ~p, stack: ~p", [Error, Stack]), Req2 = cowboy_req:reply(500, #{ <<"Content-Type">> => <<"text/html;charset=utf-8">> }, <<"Internal Server Error">>, Req1), diff --git a/apps/sdlan/src/http_handler/network_handler.erl b/apps/sdlan/src/http_handler/network_handler.erl index ded897b..3475723 100644 --- a/apps/sdlan/src/http_handler/network_handler.erl +++ b/apps/sdlan/src/http_handler/network_handler.erl @@ -17,7 +17,7 @@ handle_request("POST", "/network/create", _, #{<<"id">> := NetworkId}) when Netw {ok, Pid} when is_pid(Pid) -> {ok, 200, sdlan_util:json_data(<<"success">>)}; {error, Reason} -> - lager:debug("[network_handler] create network: ~p, get error: ~p", [NetworkId, Reason]), + logger:debug("[network_handler] create network: ~p, get error: ~p", [NetworkId, Reason]), {ok, 200, sdlan_util:json_error(-1, <<"error">>)} end; @@ -29,7 +29,7 @@ handle_request("POST", "/network/reload", _, #{<<"id">> := NetworkId}) when Netw sdlan_network_sup:reallocate_bind_width(), {ok, 200, sdlan_util:json_data(<<"success">>)}; {error, Reason} -> - lager:debug("[network_handler] start network: ~p, get error: ~p", [NetworkId, Reason]), + logger:debug("[network_handler] start network: ~p, get error: ~p", [NetworkId, Reason]), {ok, 200, sdlan_util:json_error(-1, <<"error">>)} end; NetworkPid when is_pid(NetworkPid) -> @@ -37,7 +37,7 @@ handle_request("POST", "/network/reload", _, #{<<"id">> := NetworkId}) when Netw ok -> {ok, 200, sdlan_util:json_data(<<"success">>)}; {error, Reason} -> - lager:debug("[network_handler] reload network: ~p, get error: ~p", [NetworkId, Reason]), + logger:debug("[network_handler] reload network: ~p, get error: ~p", [NetworkId, Reason]), {ok, 200, sdlan_util:json_error(-1, <<"error">>)} end end; @@ -51,7 +51,7 @@ handle_request("POST", "/network/delete", _, #{<<"id">> := NetworkId}) when Netw ok -> {ok, 200, sdlan_util:json_data(<<"success">>)}; {error, Reason} -> - lager:debug("[network_handler] delete network: ~p, get error: ~p", [NetworkId, Reason]), + logger:debug("[network_handler] delete network: ~p, get error: ~p", [NetworkId, Reason]), {ok, 200, sdlan_util:json_error(-1, <<"error">>)} end end; diff --git a/apps/sdlan/src/http_handler/node_handler.erl b/apps/sdlan/src/http_handler/node_handler.erl index e85c13f..d00aff3 100644 --- a/apps/sdlan/src/http_handler/node_handler.erl +++ b/apps/sdlan/src/http_handler/node_handler.erl @@ -49,7 +49,7 @@ handle_request("POST", "/node/move", _, #{<<"client_id">> := ClientId, <<"from_n Ref = sdlan_channel:move_network(ChannelPid, self(), ToPid, HostName), receive {command_reply, Ref, {error, Reason}} -> - lager:warning("[node_handler] client_id: ~p, move network from: ~p, to: ~p, get error: ~p", [ClientId, FromPid, ToPid, Reason]), + logger:warning("[node_handler] client_id: ~p, move network from: ~p, to: ~p, get error: ~p", [ClientId, FromPid, ToPid, Reason]), {ok, 200, sdlan_util:json_error(-1, <<"move failed">>)}; {command_reply, Ref, #sdl_command_ack{status = true}} -> {ok, 200, sdlan_util:json_data(<<"success">>)}; diff --git a/apps/sdlan/src/http_handler/test_handler.erl b/apps/sdlan/src/http_handler/test_handler.erl index b03d977..5f81d5e 100644 --- a/apps/sdlan/src/http_handler/test_handler.erl +++ b/apps/sdlan/src/http_handler/test_handler.erl @@ -18,7 +18,7 @@ %% 重新加载对应的主机信息 handle_request("POST", "/test/auth_token", _, PostParams) -> - lager:debug("[test_handler] get post params: ~p", [PostParams]), + logger:debug("[test_handler] get post params: ~p", [PostParams]), Data = #{ <<"network_id">> => 8, <<"upgrade_type">> => 0, @@ -28,7 +28,7 @@ handle_request("POST", "/test/auth_token", _, PostParams) -> {ok, 200, sdlan_util:json_data(Data)}; handle_request("POST", "/test/upgrade", _, PostParams) -> - lager:debug("[test_handler] get post params: ~p", [PostParams]), + logger:debug("[test_handler] get post params: ~p", [PostParams]), Data = #{ <<"upgrade_type">> => 1, <<"upgrade_prompt">> => <<"prompt需要升级"/utf8>>, diff --git a/apps/sdlan/src/mnesia/client_model.erl b/apps/sdlan/src/mnesia/client_model.erl index 306d3d4..edb7d9c 100644 --- a/apps/sdlan/src/mnesia/client_model.erl +++ b/apps/sdlan/src/mnesia/client_model.erl @@ -156,7 +156,7 @@ debug(NetworkId) when is_integer(NetworkId) -> end, case mnesia:transaction(F) of {'atomic', Records} -> - lists:foreach(fun(C) -> lager:debug("client: ~p", [C]) end, Records); + lists:foreach(fun(C) -> logger:debug("client: ~p", [C]) end, Records); {'aborted', Reason} -> - lager:warning("read clients get error: ~p", [Reason]) + logger:warning("read clients get error: ~p", [Reason]) end. \ No newline at end of file diff --git a/apps/sdlan/src/mysql/mysql_provider.erl b/apps/sdlan/src/mysql/mysql_provider.erl index 7415f9d..e246124 100644 --- a/apps/sdlan/src/mysql/mysql_provider.erl +++ b/apps/sdlan/src/mysql/mysql_provider.erl @@ -16,49 +16,49 @@ %% 从数据库中查找一行记录 -spec get_row(ConnPid :: pid(), Sql::binary()) -> {ok, Record::map()} | undefined. get_row(ConnPid, Sql) when is_pid(ConnPid), is_binary(Sql) -> - lager:debug("[mysql_client] get_row sql is: ~p", [Sql]), + logger:debug("[mysql_client] get_row sql is: ~p", [Sql]), case mysql:query(ConnPid, Sql) of {ok, Names, [Row | _]} -> {ok, maps:from_list(lists:zip(Names, Row))}; {ok, _, []} -> undefined; Error -> - lager:warning("[mysql_client] get error: ~p", [Error]), + logger:warning("[mysql_client] get error: ~p", [Error]), undefined end. -spec get_row(ConnPid :: pid(), Sql::binary(), Params::list()) -> {ok, Record::map()} | undefined. get_row(ConnPid, Sql, Params) when is_pid(ConnPid), is_binary(Sql), is_list(Params) -> - lager:debug("[mysql_client] get_row sql is: ~p, params: ~p", [Sql, Params]), + logger:debug("[mysql_client] get_row sql is: ~p, params: ~p", [Sql, Params]), case mysql:query(ConnPid, Sql, Params) of {ok, Names, [Row | _]} -> {ok, maps:from_list(lists:zip(Names, Row))}; {ok, _, []} -> undefined; Error -> - lager:warning("[mysql_client] get error: ~p", [Error]), + logger:warning("[mysql_client] get error: ~p", [Error]), undefined end. -spec get_all(ConnPid :: pid(), Sql::binary()) -> {ok, Rows::list()} | {error, Reason :: any()}. get_all(ConnPid, Sql) when is_pid(ConnPid), is_binary(Sql) -> - lager:debug("[mysql_client] get_all sql is: ~p", [Sql]), + logger:debug("[mysql_client] get_all sql is: ~p", [Sql]), case mysql:query(ConnPid, Sql) of {ok, Names, Rows} -> {ok, lists:map(fun(Row) -> maps:from_list(lists:zip(Names, Row)) end, Rows)}; {error, Reason} -> - lager:warning("[mysql_client] get error: ~p", [Reason]), + logger:warning("[mysql_client] get error: ~p", [Reason]), {error, Reason} end. -spec get_all(ConnPid :: pid(), Sql::binary(), Params::list()) -> {ok, Rows::list()} | {error, Reason::any()}. get_all(ConnPid, Sql, Params) when is_pid(ConnPid), is_binary(Sql), is_list(Params) -> - lager:debug("[mysql_client] get_all sql is: ~p, params: ~p", [Sql, Params]), + logger:debug("[mysql_client] get_all sql is: ~p, params: ~p", [Sql, Params]), case mysql:query(ConnPid, Sql, Params) of {ok, Names, Rows} -> {ok, lists:map(fun(Row) -> maps:from_list(lists:zip(Names, Row)) end, Rows)}; {error, Reason} -> - lager:warning("[mysql_client] get error: ~p", [Reason]), + logger:warning("[mysql_client] get error: ~p", [Reason]), {error, Reason} end. @@ -74,7 +74,7 @@ insert(ConnPid, Table, Fields, FetchInsertId) when is_pid(ConnPid), is_binary(Ta ValuesPlaceholder = iolist_to_binary(lists:join(<<", ">>, Placeholders)), Sql = <<"INSERT INTO ", Table/binary, "(", FieldSql/binary, ") VALUES(", ValuesPlaceholder/binary, ")">>, - lager:debug("[mysql_client] insert sql is: ~p, params: ~p", [Sql, Values]), + logger:debug("[mysql_client] insert sql is: ~p, params: ~p", [Sql, Values]), case mysql:query(ConnPid, Sql, Values) of ok -> case FetchInsertId of @@ -90,7 +90,7 @@ insert(ConnPid, Table, Fields, FetchInsertId) when is_pid(ConnPid), is_binary(Ta -spec update_by(ConnPid :: pid(), UpdateSql :: binary()) -> {ok, AffectedRows :: integer()} | {error, Reason :: any()}. update_by(ConnPid, UpdateSql) when is_pid(ConnPid), is_binary(UpdateSql) -> - lager:debug("[mysql_client] updateBySql sql: ~p", [UpdateSql]), + logger:debug("[mysql_client] updateBySql sql: ~p", [UpdateSql]), case mysql:query(ConnPid, UpdateSql) of ok -> AffectedRows = mysql:affected_rows(ConnPid), @@ -101,7 +101,7 @@ update_by(ConnPid, UpdateSql) when is_pid(ConnPid), is_binary(UpdateSql) -> -spec update_by(ConnPid :: pid(), UpdateSql :: binary(), Params :: list()) -> {ok, AffectedRows :: integer()} | {error, Reason :: any()}. update_by(ConnPid, UpdateSql, Params) when is_pid(ConnPid), is_binary(UpdateSql) -> - lager:debug("[mysql_client] updateBySql sql: ~p, params: ~p", [UpdateSql, Params]), + logger:debug("[mysql_client] updateBySql sql: ~p, params: ~p", [UpdateSql, Params]), case mysql:query(ConnPid, UpdateSql, Params) of ok -> AffectedRows = mysql:affected_rows(ConnPid), @@ -126,13 +126,13 @@ update(ConnPid, Table, Fields, WhereFields) when is_pid(ConnPid), is_binary(Tabl Params = SetVals ++ WhereVals, Sql = <<"UPDATE ", Table/binary, " SET ", SetSql/binary, " WHERE ", WhereSql/binary>>, - lager:debug("[mysql_client] update sql is: ~p, params: ~p", [Sql, Params]), + logger:debug("[mysql_client] update sql is: ~p, params: ~p", [Sql, Params]), case mysql:query(ConnPid, Sql, Params) of ok -> AffectedRows = mysql:affected_rows(ConnPid), {ok, AffectedRows}; Error -> - lager:error("[mysql_client] update sql: ~p, params: ~p, get a error: ~p", [Sql, Params, Error]), + logger:error("[mysql_client] update sql: ~p, params: ~p, get a error: ~p", [Sql, Params, Error]), Error end. diff --git a/apps/sdlan/src/sdlan.app.src b/apps/sdlan/src/sdlan.app.src index be8ab20..f078141 100644 --- a/apps/sdlan/src/sdlan.app.src +++ b/apps/sdlan/src/sdlan.app.src @@ -6,7 +6,6 @@ {applications, [ sync, - lager, cowboy, ranch, poolboy, diff --git a/apps/sdlan/src/sdlan_app.erl b/apps/sdlan/src/sdlan_app.erl index 92ac12d..f2bd1b8 100644 --- a/apps/sdlan/src/sdlan_app.erl +++ b/apps/sdlan/src/sdlan_app.erl @@ -57,7 +57,7 @@ start_http_server() -> {ok, Pid} = cowboy:start_clear(http_listener, TransOpts, #{env => #{dispatch => Dispatcher}}), - lager:debug("[iot_app] the http server start at: ~p, pid is: ~p", [Port, Pid]). + logger:debug("[iot_app] the http server start at: ~p, pid is: ~p", [Port, Pid]). %% 启动tcp服务 start_tcp_server() -> @@ -78,4 +78,4 @@ start_tcp_server() -> }, {ok, _} = ranch:start_listener('sdlan/tcp_server', ranch_tcp, TransOpts, sdlan_channel, []), - lager:debug("[sdlan_app] the tcp server start at: ~p", [Port]). \ No newline at end of file + logger:debug("[sdlan_app] the tcp server start at: ~p", [Port]). \ No newline at end of file diff --git a/apps/sdlan/src/sdlan_channel.erl b/apps/sdlan/src/sdlan_channel.erl index 867bd19..aa9ff11 100644 --- a/apps/sdlan/src/sdlan_channel.erl +++ b/apps/sdlan/src/sdlan_channel.erl @@ -104,7 +104,7 @@ start_link(Ref, _Socket, Transport, Opts) -> init([Ref, Transport, _Opts = []]) -> {ok, Socket} = ranch:handshake(Ref), - lager:debug("[sdlan_channel] get a new connection: ~p", [Socket]), + logger:debug("[sdlan_channel] get a new connection: ~p", [Socket]), Transport:setopts(Socket, [{active, true}, {packet, 2}]), erlang:start_timer(?PING_TICKER, self(), ping_ticker), gen_server:enter_loop(?MODULE, [], #state{transport = Transport, socket = Socket}). @@ -120,23 +120,23 @@ handle_info({tcp, Sock, <>}, S #sdl_register_super{version = Version, client_id = ClientId, dev_addr = #sdl_dev_addr{mac = Mac}, network_code = NetworkCode, token = Token, pub_key = PubKey} = sdlan_pb:decode_msg(Body, sdl_register_super), %% 参数检查 - lager:debug("[sdlan_channel] client_id: ~p, public_key: ~p, token: ~p, network_code: ~p", [ClientId, PubKey, Token, NetworkCode]), + logger:debug("[sdlan_channel] client_id: ~p, public_key: ~p, token: ~p, network_code: ~p", [ClientId, PubKey, Token, NetworkCode]), true = (Mac =/= <<>> andalso PubKey =/= <<>> andalso ClientId =/= <<>>), %% Mac地址不能是广播地址 true = not (sdlan_util:is_multicast_mac(Mac) orelse sdlan_util:is_broadcast_mac(Mac)), AuthResult = if Token /= <<>> -> - lager:debug("[sdlan_channel] auth token: ~p", [Token]), + logger:debug("[sdlan_channel] auth token: ~p", [Token]), sdlan_api:auth_token(ClientId, Token, Version); NetworkCode /= <<>> -> - lager:debug("[sdlan_channel] auth network code: ~p", [NetworkCode]), + logger:debug("[sdlan_channel] auth network code: ~p", [NetworkCode]), sdlan_api:auth_network_code(ClientId, NetworkCode, Version) end, case AuthResult of {ok, #{<<"result">> := #{<<"network_id">> := NetworkId, <<"upgrade_type">> := UpgradeType, <<"upgrade_prompt">> := UpgradePrompt, <<"upgrade_address">> := UpgradeAddress}}} when is_integer(NetworkId) -> - lager:debug("[sdlan_channel] client_id: ~p, mac: ~p, token: ~p, version: ~p, registerd, alloc network_id: ~p", [ClientId, sdlan_util:format_mac(Mac), Token, Version, NetworkId]), + logger:debug("[sdlan_channel] client_id: ~p, mac: ~p, token: ~p, version: ~p, registerd, alloc network_id: ~p", [ClientId, sdlan_util:format_mac(Mac), Token, Version, NetworkId]), %% 建立到network的对应关系 case sdlan_network:get_pid(NetworkId) of NetworkPid when is_pid(NetworkPid) -> @@ -162,52 +162,52 @@ handle_info({tcp, Sock, <>}, S %% 发送确认信息 Reply = <>, Transport:send(Sock, Reply), - lager:debug("[sdlan_channel] client_id: ~p, mac: ~p, alloc ip: ~p, register will send ack, aes_key: ~p, enc_aes_key: ~p", + logger:debug("[sdlan_channel] client_id: ~p, mac: ~p, alloc ip: ~p, register will send ack, aes_key: ~p, enc_aes_key: ~p", [ClientId, sdlan_util:format_mac(Mac), sdlan_ipaddr:int_to_ipv4(NetAddr), AesKey, EncodedAesKey]), %% 设置节点的在线状态 Result = sdlan_api:node_online(ClientId, NetworkId, sdlan_ipaddr:int_to_ipv4(NetAddr)), - lager:debug("[sdlan_channel] client_id: ~p, set none online, result is: ~p", [ClientId, Result]), + logger:debug("[sdlan_channel] client_id: ~p, set none online, result is: ~p", [ClientId, Result]), case UpgradeType =:= ?UPGRADE_FORCE of true -> - lager:warning("[sdlan_channel] client_id: ~p, need upgrade force!", [ClientId]), + logger:warning("[sdlan_channel] client_id: ~p, need upgrade force!", [ClientId]), {stop, normal, State}; false -> {noreply, State#state{client_id = ClientId, mac = Mac, assign_ip = NetAddr, network_pid = NetworkPid, pub_key = PubKey, is_registered = true}} end; {error, no_ip} -> - lager:warning("[sdlan_channel] client_id: ~p, token: ~p, register get error: no_ip", [ClientId, Token]), + logger:warning("[sdlan_channel] client_id: ~p, token: ~p, register get error: no_ip", [ClientId, Token]), Transport:send(Sock, register_nak_reply(PacketId, ?NAK_NO_IP, <<"No Ip address">>)), {stop, normal, State}; {error, host_name_used} -> - lager:warning("[sdlan_channel] client_id: ~p, token: ~p, register get error: host_name_used", [ClientId, Token]), + logger:warning("[sdlan_channel] client_id: ~p, token: ~p, register get error: host_name_used", [ClientId, Token]), Transport:send(Sock, register_nak_reply(PacketId, ?NAK_HOSTNAME_USED, <<"Host Name Used">>)), {stop, normal, State}; {error, client_disabled} -> - lager:warning("[sdlan_channel] client_id: ~p, token: ~p, register get error: client_disabled", [ClientId, Token]), + logger:warning("[sdlan_channel] client_id: ~p, token: ~p, register get error: client_disabled", [ClientId, Token]), Transport:send(Sock, register_nak_reply(PacketId, ?NAK_NODE_DISABLE, <<"Client Connection Disable">>)), {stop, normal, State} catch _:Error:Stack -> - lager:warning("[sdlan_channel] get error: ~p, stack: ~p", [Error, Stack]) + logger:warning("[sdlan_channel] get error: ~p, stack: ~p", [Error, Stack]) end; undefined -> - lager:warning("[sdlan_channel] client_id: ~p, token: ~p, register get error: network not found", [ClientId, Token]), + logger:warning("[sdlan_channel] client_id: ~p, token: ~p, register get error: network not found", [ClientId, Token]), Transport:send(Sock, register_nak_reply(PacketId, ?NAK_INTERNAL_FAULT, <<"Internal Error">>)), {stop, normal, State} end; {ok, #{<<"error">> := #{<<"code">> := 1, <<"message">> := Message}}} -> - lager:warning("[sdlan_channel] client_id: ~p, token: ~p, register get error: ~ts, error_code: 1", [ClientId, Token, Message]), + logger:warning("[sdlan_channel] client_id: ~p, token: ~p, register get error: ~ts, error_code: 1", [ClientId, Token, Message]), Transport:send(Sock, register_nak_reply(PacketId, ?NAK_INVALID_TOKEN, Message)), {stop, normal, State}; {ok, #{<<"error">> := #{<<"code">> := 2, <<"message">> := Message}}} -> - lager:warning("[sdlan_channel] client_id: ~p, token: ~p, register get error: ~p, error_code: 2", [ClientId, Token, Message]), + logger:warning("[sdlan_channel] client_id: ~p, token: ~p, register get error: ~p, error_code: 2", [ClientId, Token, Message]), Transport:send(Sock, register_nak_reply(PacketId, ?NAK_NODE_DISABLE, Message)), {stop, normal, State}; {error, Reason} -> - lager:warning("[sdlan_channel] client_id: ~p, token: ~p, register get error: ~p", [ClientId, Token, Reason]), + logger:warning("[sdlan_channel] client_id: ~p, token: ~p, register get error: ~p", [ClientId, Token, Reason]), Transport:send(Sock, register_nak_reply(PacketId, ?NAK_NETWORK_FAULT, <<"Network Error">>)), {stop, normal, State} end; @@ -216,13 +216,13 @@ handle_info({tcp, Sock, <>}, State #sdl_query_info{dst_mac = DstMac} = sdlan_pb:decode_msg(Body, sdl_query_info), case sdlan_network:peer_info(NetworkPid, SrcMac, DstMac) of error -> - lager:debug("[sdlan_channel] query_info src_mac is: ~p, dst_mac: ~p, nat_peer not found", + logger:debug("[sdlan_channel] query_info src_mac is: ~p, dst_mac: ~p, nat_peer not found", [sdlan_util:format_mac(SrcMac), sdlan_util:format_mac(DstMac)]), Transport:send(Sock, <>), {noreply, State}; {ok, {NatPeer = {{Ip0, Ip1, Ip2, Ip3}, NatPort}, NatType}, V6Info} -> - lager:debug("[sdlan_channel] query_info src_mac is: ~p, dst_mac: ~p, nat_peer: ~p", + logger:debug("[sdlan_channel] query_info src_mac is: ~p, dst_mac: ~p, nat_peer: ~p", [sdlan_util:format_mac(SrcMac), sdlan_util:format_mac(DstMac), NatPeer]), PeerInfo = sdlan_pb:encode_msg(#sdl_peer_info{ @@ -239,7 +239,7 @@ handle_info({tcp, Sock, <>}, State end; handle_info({tcp, _Sock, <<0:32, ?PACKET_PING>>}, State = #state{transport = Transport, socket = Sock, ping_counter = PingCounter}) -> - %lager:debug("[sdlan_channel] client_id: ~p, get ping", [ClientId]), + %logger:debug("[sdlan_channel] client_id: ~p, get ping", [ClientId]), Transport:send(Sock, <<0:32, ?PACKET_PONG>>), {noreply, State#state{ping_counter = PingCounter + 1}}; @@ -250,7 +250,7 @@ handle_info({timeout, _, ping_ticker}, State = #state{client_id = ClientId, ping true -> {noreply, State#state{ping_counter = 0}}; false -> - lager:debug("[sdlan_channel] client_id: ~p, ping losted", [ClientId]), + logger:debug("[sdlan_channel] client_id: ~p, ping losted", [ClientId]), {stop, normal, State#state{ping_counter = 0}} end; @@ -281,10 +281,10 @@ handle_info({move_network, ReceiverPid, Ref, NetworkPid, HostName}, %% 设置节点的在线状态 sdlan_api:node_online(ClientId, NetworkId, sdlan_ipaddr:int_to_ipv4(NetAddr)), - lager:debug("[sdlan_channel] client_id: ~p, move_network will send command: ~p", [ClientId, Command]), + logger:debug("[sdlan_channel] client_id: ~p, move_network will send command: ~p", [ClientId, Command]), {noreply, State#state{packet_id = PacketId + 1, assign_ip = NetAddr, network_pid = NetworkPid, inflight = maps:put(PacketId, {ReceiverPid, Ref}, Inflight)}}; {error, Reason} -> - lager:debug("[sdlan_channel] client_id: ~p, move_network get error: ~p", [ClientId, Reason]), + logger:debug("[sdlan_channel] client_id: ~p, move_network get error: ~p", [ClientId, Reason]), Transport:send(Sock, register_nak_reply(0, ?NAK_NO_IP, <<"No Ip address">>)), ReceiverPid ! {command_reply, Ref, {error, <<"assign_ip error, no ip free">>}}, {noreply, State} @@ -292,7 +292,7 @@ handle_info({move_network, ReceiverPid, Ref, NetworkPid, HostName}, %% 发送指令信息 handle_info({send_event, EventType, Event}, State = #state{transport = Transport, socket = Sock, client_id = ClientId, is_registered = true}) -> - lager:debug("[sdlan_channel] client_id: ~p, will send eventType: ~p, event: ~p", [ClientId, EventType, Event]), + logger:debug("[sdlan_channel] client_id: ~p, will send eventType: ~p, event: ~p", [ClientId, EventType, Event]), Transport:send(Sock, <<0:32, ?PACKET_EVENT, EventType, Event/binary>>), {noreply, State}; @@ -301,18 +301,18 @@ handle_info({tcp, _Sock, <<0:32, ?PACKET_FLOW_TRACER, Body/binary>>}, State = #s #sdl_flows{forward_num = ForwardNum, p2p_num = P2PNum, inbound_num = InboundNum} = sdlan_pb:decode_msg(Body, sdl_flows), {ok, NetworkId} = sdlan_network:get_network_id(NetworkPid), ReportResult = sdlan_api:flow_report(ClientId, NetworkId, ForwardNum, P2PNum, InboundNum), - lager:debug("[sdlan_channel] flow_tracer, forward: ~p, p2p: ~p, inbound: ~p, result: ~p", [ClientId, ForwardNum, P2PNum, InboundNum, ReportResult]), + logger:debug("[sdlan_channel] flow_tracer, forward: ~p, p2p: ~p, inbound: ~p, result: ~p", [ClientId, ForwardNum, P2PNum, InboundNum, ReportResult]), {noreply, State}; %% 取消注册 handle_info({tcp, _Sock, <<0:32, ?PACKET_UNREGISTER>>}, State = #state{client_id = ClientId, network_pid = NetworkPid, is_registered = true}) when is_pid(NetworkPid) -> - lager:warning("[sdlan_channel] unregister client_id: ~p", [ClientId]), + logger:warning("[sdlan_channel] unregister client_id: ~p", [ClientId]), % sdlan_network:unregister(NetworkPid, ClientId), {stop, normal, State}; %% 发送指令信息 handle_info({publish_command, ReceiverPid, Ref, CommandType, Msg}, State = #state{transport = Transport, socket = Sock, client_id = ClientId, packet_id = PacketId, inflight = Inflight, is_registered = true}) -> - lager:warning("[sdlan_channel] client_id: ~p, will publish: ~p, message: ~p", [ClientId, CommandType, Msg]), + logger:warning("[sdlan_channel] client_id: ~p, will publish: ~p, message: ~p", [ClientId, CommandType, Msg]), Transport:send(Sock, <>), {noreply, State#state{packet_id = PacketId + 1, inflight = maps:put(PacketId, {ReceiverPid, Ref}, Inflight)}}; @@ -320,27 +320,27 @@ handle_info({publish_command, ReceiverPid, Ref, CommandType, Msg}, State = #stat handle_info({tcp, _Sock, <>}, State = #state{client_id = ClientId, inflight = Inflight}) when PacketId > 0 -> CommandAck = #sdl_command_ack{} = sdlan_pb:decode_msg(Body, sdl_command_ack), - lager:debug("[sdlan_channel] client_id: ~p, get publish response message: ~p, packet_id: ~p", [ClientId, CommandAck, PacketId]), + logger:debug("[sdlan_channel] client_id: ~p, get publish response message: ~p, packet_id: ~p", [ClientId, CommandAck, PacketId]), case maps:take(PacketId, Inflight) of error -> - lager:warning("[sdlan_channel] get unknown publish response message: ~p, packet_id: ~p", [CommandAck, PacketId]), + logger:warning("[sdlan_channel] get unknown publish response message: ~p, packet_id: ~p", [CommandAck, PacketId]), {ok, State}; {{ReceiverPid, Ref}, NInflight} -> case is_pid(ReceiverPid) andalso is_process_alive(ReceiverPid) of true -> ReceiverPid ! {command_reply, Ref, CommandAck}; false -> - lager:warning("[sdlan_channel] get publish response message: ~p, packet_id: ~p, but receiver_pid is deaded", [CommandAck, PacketId]) + logger:warning("[sdlan_channel] get publish response message: ~p, packet_id: ~p, but receiver_pid is deaded", [CommandAck, PacketId]) end, {noreply, State#state{inflight = NInflight}} end; handle_info({tcp_error, Sock, Reason}, State = #state{socket = Sock, client_id = ClientId}) -> - lager:notice("[sdlan_channel] client_id: ~p, tcp_error: ~p", [ClientId, Reason]), + logger:notice("[sdlan_channel] client_id: ~p, tcp_error: ~p", [ClientId, Reason]), {stop, normal, State}; handle_info({tcp_closed, Sock}, State = #state{socket = Sock, client_id = ClientId}) -> - lager:notice("[sdlan_channel] client_id: ~p, tcp_closed", [ClientId]), + logger:notice("[sdlan_channel] client_id: ~p, tcp_closed", [ClientId]), {stop, normal, State}; %% 关闭当前通道 @@ -348,7 +348,7 @@ handle_info({stop, Reason}, State) -> {stop, Reason, State}; handle_info(Info, State) -> - lager:warning("[sdlan_channel] get a unknown message: ~p, channel will closed", [Info]), + logger:warning("[sdlan_channel] get a unknown message: ~p, channel will closed", [Info]), {noreply, State}. terminate(Reason, #state{client_id = ClientId, network_pid = NetworkPid}) -> @@ -356,11 +356,11 @@ terminate(Reason, #state{client_id = ClientId, network_pid = NetworkPid}) -> true -> {ok, NetworkId} = sdlan_network:get_network_id(NetworkPid), Result = sdlan_api:node_offline(ClientId, NetworkId), - lager:debug("[sdlan_channel] client_id: ~p, set none offline, result is: ~p", [ClientId, Result]); + logger:debug("[sdlan_channel] client_id: ~p, set none offline, result is: ~p", [ClientId, Result]); false -> ok end, - lager:warning("[sdlan_channel] client_id: ~p, stop with reason: ~p", [ClientId, Reason]), + logger:warning("[sdlan_channel] client_id: ~p, stop with reason: ~p", [ClientId, Reason]), ok. code_change(_OldVsn, State, _Extra) -> diff --git a/apps/sdlan/src/sdlan_cipher.erl b/apps/sdlan/src/sdlan_cipher.erl index 8c22c41..8282a31 100644 --- a/apps/sdlan/src/sdlan_cipher.erl +++ b/apps/sdlan/src/sdlan_cipher.erl @@ -17,7 +17,7 @@ test() -> Key = <<"abcdabcdabcdabcd">>, X = aes_encrypt(Key, Key, <<"hello world">>), - lager:debug("x is: ~p, raw: ~p", [X, aes_decrypt(Key, Key, X)]), + logger:debug("x is: ~p, raw: ~p", [X, aes_decrypt(Key, Key, X)]), ok. diff --git a/apps/sdlan/src/sdlan_network.erl b/apps/sdlan/src/sdlan_network.erl index f30a6e7..575ab3d 100644 --- a/apps/sdlan/src/sdlan_network.erl +++ b/apps/sdlan/src/sdlan_network.erl @@ -181,7 +181,7 @@ init([Id]) when is_integer(Id) -> {ok, #state{network_id = Id, name = Name, domain = Domain, ipaddr = IpAddr, owner_id = OwnerId, mask_len = MaskLen, aes_key = AesKey, throttle_key = ThrottleKey}}; {error, Reason} -> - lager:warning("[sdlan_network] load network: ~p, get error: ~p", [Id, Reason]), + logger:warning("[sdlan_network] load network: ~p, get error: ~p", [Id, Reason]), ignore end. @@ -202,7 +202,7 @@ handle_call({assign_ip_addr, ChannelPid, ClientId, Mac}, _From, case sdlan_api:assign_ip_address(NetworkId, ClientId, Mac) of {ok, #{<<"ip">> := Ip, <<"host_name">> := HostName}} -> %% 分配ip地址的时候，以mac地址为唯一基准 - lager:debug("[sdlan_network] alloc_ip, network_id: ~p, client_id: ~p, mac: ~p, net_addr: ~p", + logger:debug("[sdlan_network] alloc_ip, network_id: ~p, client_id: ~p, mac: ~p, net_addr: ~p", [NetworkId, ClientId, sdlan_util:format_mac(Mac), sdlan_ipaddr:int_to_ipv4(Ip)]), %% 关闭之前的channel maybe_close_channel(maps:get(Mac, Endpoints, undefined)), @@ -334,22 +334,22 @@ handle_cast({forward, Sock, SrcMac, DstMac, Packet}, State = #state{network_id = case limiting_check(ThrottleKey) of pass -> %% client和stun之间必须有心跳机制保持nat映射可用，并且通过服务转发的udp包肯定可以到达对端的nat - lager:debug("[sdlan_network] forward data networkd_id: ~p, src_mac: ~p, dst_mac: ~p, hole: ~p", + logger:debug("[sdlan_network] forward data networkd_id: ~p, src_mac: ~p, dst_mac: ~p, hole: ~p", [NetworkId, sdlan_util:format_mac(SrcMac), sdlan_util:format_mac(DstMac), Peer]), gen_udp:send(Sock, Ip, Port, Packet), {noreply, State#state{forward_bytes = ForwardBytes + PacketBytes}}; denied -> - lager:notice("[sdlan_network] networkd_id: ~p, src_mac: ~p, dst_mac: ~p, rate limited, discard", + logger:notice("[sdlan_network] networkd_id: ~p, src_mac: ~p, dst_mac: ~p, rate limited, discard", [NetworkId, sdlan_util:format_mac(SrcMac), sdlan_util:format_mac(DstMac)]), {noreply, State} end; {ok, _} -> - lager:debug("[sdlan_network] networkd_id: ~p, src_mac: ~p, dst_mac: ~p, hole not found", + logger:debug("[sdlan_network] networkd_id: ~p, src_mac: ~p, dst_mac: ~p, hole not found", [NetworkId, sdlan_util:format_mac(SrcMac), sdlan_util:format_mac(DstMac)]), {noreply, State}; error -> - lager:debug("[sdlan_network] networkd_id: ~p, src_mac: ~p, dst_mac: ~p not found", + logger:debug("[sdlan_network] networkd_id: ~p, src_mac: ~p, dst_mac: ~p not found", [NetworkId, sdlan_util:format_mac(SrcMac), sdlan_util:format_mac(DstMac)]), {noreply, State} end; @@ -372,24 +372,24 @@ handle_cast({forward, Sock, SrcMac, DstMac, Packet}, State = #state{network_id = end, [SrcMac], Endpoints), %% client和stun之间必须有心跳机制保持nat映射可用，并且通过服务转发的udp包肯定可以到达对端的nat - lager:debug("[sdlan_network] broadcast data networkd_id: ~p, src_mac: ~p, dst_mac: ~p", + logger:debug("[sdlan_network] broadcast data networkd_id: ~p, src_mac: ~p, dst_mac: ~p", [NetworkId, sdlan_util:format_mac(SrcMac), sdlan_util:format_mac(DstMac)]), {noreply, State#state{forward_bytes = ForwardBytes + PacketBytes}}; false -> - lager:debug("[sdlan_network] networkd_id: ~p, src_mac: ~p, dst_mac: ~p, forward discard 1", + logger:debug("[sdlan_network] networkd_id: ~p, src_mac: ~p, dst_mac: ~p, forward discard 1", [NetworkId, sdlan_util:format_mac(SrcMac), sdlan_util:format_mac(DstMac)]), {noreply, State} end; handle_cast({forward, _Sock, SrcMac, DstMac, _Packet}, State = #state{network_id = NetworkId}) -> - lager:debug("[sdlan_network] networkd_id: ~p, src_mac: ~p, dst_mac: ~p, forward discard 2", + logger:debug("[sdlan_network] networkd_id: ~p, src_mac: ~p, dst_mac: ~p, forward discard 2", [NetworkId, sdlan_util:format_mac(SrcMac), sdlan_util:format_mac(DstMac)]), {noreply, State}; %% 删除ip的占用并关闭channel handle_cast({unregister, _ClientId, Mac}, State = #state{network_id = NetworkId, endpoints = Endpoints}) -> - lager:debug("[sdlan_network] networkd_id: ~p, unregister Mac: ~p", [NetworkId, sdlan_util:format_mac(Mac)]), + logger:debug("[sdlan_network] networkd_id: ~p, unregister Mac: ~p", [NetworkId, sdlan_util:format_mac(Mac)]), case maps:take(Mac, Endpoints) of error -> {noreply, State}; @@ -439,7 +439,7 @@ handle_info({timeout, _, flow_report_ticker}, State = #state{network_id = Networ {noreply, State#state{forward_bytes = 0}}; handle_info({'EXIT', _Pid, shutdown}, State = #state{network_id = NetworkId, endpoints = Endpoints}) -> - lager:warning("[sdlan_network] network: ~p, get shutdown message", [NetworkId]), + logger:warning("[sdlan_network] network: ~p, get shutdown message", [NetworkId]), NetworkShutdownEvent = sdlan_pb:encode_msg(#sdl_network_shutdown_event { message = <<"Network shutdown">> @@ -457,7 +457,7 @@ handle_info({'EXIT', _Pid, shutdown}, State = #state{network_id = NetworkId, end {stop, shutdown, State}; %% Channel进程退出, hole里面的数据也需要清理 handle_info({'DOWN', _MRef, process, ChannelPid, Reason}, State = #state{network_id = NetworkId, endpoints = Endpoints}) -> - lager:notice("[sdlan_network] network_id: ~p, channel_pid: ~p, close with reason: ~p", [NetworkId, ChannelPid, Reason]), + logger:notice("[sdlan_network] network_id: ~p, channel_pid: ~p, close with reason: ~p", [NetworkId, ChannelPid, Reason]), NUsedMap = maps:filter(fun(_, #endpoint{channel_pid = ChannelPid0}) -> ChannelPid =/= ChannelPid0 end, Endpoints), {noreply, State#state{endpoints = NUsedMap}}. @@ -469,7 +469,7 @@ handle_info({'DOWN', _MRef, process, ChannelPid, Reason}, State = #state{network -spec(terminate(Reason :: (normal | shutdown | {shutdown, term()} | term()), State :: #state{}) -> term()). terminate(Reason, #state{network_id = NetworkId, endpoints = Endpoints}) -> - lager:debug("[sdlan_network] network: ~p, will terminate with reason: ~p", [NetworkId, Reason]), + logger:debug("[sdlan_network] network: ~p, will terminate with reason: ~p", [NetworkId, Reason]), NetworkShutdownEvent = sdlan_pb:encode_msg(#sdl_network_shutdown_event { message = <<"Network shutdown">> diff --git a/apps/sdlan/src/sdlan_network_coordinator.erl b/apps/sdlan/src/sdlan_network_coordinator.erl index 1223195..2d7053d 100644 --- a/apps/sdlan/src/sdlan_network_coordinator.erl +++ b/apps/sdlan/src/sdlan_network_coordinator.erl @@ -104,10 +104,10 @@ handle_info({timeout, _, release_ticker}, State = #state{network_map = ChannelMa Acc end end, 0, maps:keys(ChannelMap)), - % lager:debug("[sdlan_network_coordinator] can release count is: ~p", [AccReleaseCount]), + % logger:debug("[sdlan_network_coordinator] can release count is: ~p", [AccReleaseCount]), {noreply, State#state{release_count = AccReleaseCount}}; handle_info({'DOWN', _, process, NetworkPid, Reason}, State = #state{network_map = NetworkMap}) -> - lager:debug("[sdlan_network_coordinator] network_pid close with reason: ~p", [Reason]), + logger:debug("[sdlan_network_coordinator] network_pid close with reason: ~p", [Reason]), {noreply, State#state{network_map = maps:remove(NetworkPid, NetworkMap)}}. %% @private diff --git a/apps/sdlan/src/sdlan_stun.erl b/apps/sdlan/src/sdlan_stun.erl index f438e2c..686f503 100644 --- a/apps/sdlan/src/sdlan_stun.erl +++ b/apps/sdlan/src/sdlan_stun.erl @@ -58,7 +58,7 @@ init([Port]) -> {ok, Socket} = gen_udp:open(Port, [binary, {active, true}, {recbuf, 5 * 1024 * 1024}, {sndbuf, 5 * 1024 * 1024}]), inet_udp:controlling_process(Socket, self()), - lager:debug("[sdlan_stun] start at port: ~p", [Port]), + logger:debug("[sdlan_stun] start at port: ~p", [Port]), case application:get_env(sdlan, stun_assist) of undefined -> @@ -105,7 +105,7 @@ handle_info({udp, Sock, Ip, Port, <>}, Stat case sdlan_network:get_pid(NetworkId) of undefined -> - lager:debug("[sdlan_stun] stun_request network_id: ~p, client_id: ~p, not found", [NetworkId, ClientId]), + logger:debug("[sdlan_stun] stun_request network_id: ~p, client_id: ~p, not found", [NetworkId, ClientId]), {noreply, State}; NetworkPid when is_pid(NetworkPid) -> sdlan_network:update_hole(NetworkPid, ClientId, Mac, {Ip, Port}, NatType, V6Info), @@ -113,7 +113,7 @@ handle_info({udp, Sock, Ip, Port, <>}, Stat cookie = Cookie }), ok = gen_udp:send(Sock, Ip, Port, <>), - lager:debug("[sdlan_stun] stun_request network_id: ~p, client_id: ~p, hole: ~p", [NetworkId, ClientId, {Ip, Port}]), + logger:debug("[sdlan_stun] stun_request network_id: ~p, client_id: ~p, hole: ~p", [NetworkId, ClientId, {Ip, Port}]), {noreply, State} end; @@ -121,7 +121,7 @@ handle_info({udp, Sock, Ip, Port, <>}, Stat %% 辅助节点没有assist的配置，不支持attr = 2的探测 handle_info({udp, Sock, Ip = {Ip0, Ip1, Ip2, Ip3}, Port, <>}, State = #state{socket = Sock, stun_assist = StunAssist}) -> #sdl_stun_probe{cookie = Cookie, attr = Attr} = sdlan_pb:decode_msg(Body, sdl_stun_probe), - lager:debug("[sdlan_stun] get stun_probe request, att: ~p", [Attr]), + logger:debug("[sdlan_stun] get stun_probe request, att: ~p", [Attr]), ProbeReply = sdlan_pb:encode_msg(#sdl_stun_probe_reply { cookie = Cookie, @@ -147,14 +147,14 @@ handle_info({udp, Sock, Ip = {Ip0, Ip1, Ip2, Ip3}, Port, <>}, State = #state{socket = Sock}) -> - lager:debug("[sdlan_stun] get stun_probe_replay request, reply: ~p", [Reply]), + logger:debug("[sdlan_stun] get stun_probe_replay request, reply: ~p", [Reply]), gen_udp:send(Sock, {Ip0, Ip1, Ip2, Ip3}, Port, Reply), {noreply, State}; handle_info({udp, _, _Ip, _Port, <>}, State = #state{socket = Sock}) -> Data = #sdl_data{network_id = NetworkId, src_mac = SrcMac, dst_mac = DstMac, ttl = TTL} = sdlan_pb:decode_msg(Body, sdl_data), - lager:debug("[sdlan_stun] stun data, src_mac: ~p, dst_mac: ~p", [sdlan_util:format_mac(SrcMac), sdlan_util:format_mac(DstMac)]), + logger:debug("[sdlan_stun] stun data, src_mac: ~p, dst_mac: ~p", [sdlan_util:format_mac(SrcMac), sdlan_util:format_mac(DstMac)]), maybe {ok, NetworkPid} ?= sdlan_network:lookup_pid(NetworkId), %% 重新打包数据ttl需要减1 @@ -165,7 +165,7 @@ handle_info({udp, _, _Ip, _Port, <>}, State = #s handle_info({udp, _, Ip, Port, <>}, State = #state{socket = Sock}) -> #sdl_arp_request{network_id = NetworkId, target_ip = TargetIp} = sdlan_pb:decode_msg(Body, sdl_arp_request), - lager:debug("[sdlan_stun] stun sdl_arp_request, network_id: ~p, target_ip: ~p", [NetworkId, TargetIp]), + logger:debug("[sdlan_stun] stun sdl_arp_request, network_id: ~p, target_ip: ~p", [NetworkId, TargetIp]), maybe {ok, NetworkPid} ?= sdlan_network:lookup_pid(NetworkId), {ok, TargetMac} ?= sdlan_network:arp_query(NetworkPid, TargetIp), @@ -175,7 +175,7 @@ handle_info({udp, _, Ip, Port, <>}, State = #s {noreply, State}; handle_info(Info, State) -> - lager:error("[sdlan_stun] get a unknown message: ~p, channel will closed", [Info]), + logger:error("[sdlan_stun] get a unknown message: ~p, channel will closed", [Info]), {noreply, State}. %% @private diff --git a/apps/sdlan/src/test/sdlan_udp_wget.erl b/apps/sdlan/src/test/sdlan_udp_wget.erl index cee81bd..b910336 100644 --- a/apps/sdlan/src/test/sdlan_udp_wget.erl +++ b/apps/sdlan/src/test/sdlan_udp_wget.erl @@ -86,7 +86,7 @@ handle_cast(_Info, State) -> handle_info({udp, Sock, _Ip, _Port, Data}, State = #state{socket = Sock, bytes = Bytes}) -> {noreply, State#state{bytes = Bytes + byte_size(Data)}}; handle_info({timeout, _, qps_ticker}, State = #state{bytes = Bytes}) -> - lager:debug("[sdlan_udp_wget] qps is: ~p(M)", [Bytes / 1024 / 1024]), + logger:debug("[sdlan_udp_wget] qps is: ~p(M)", [Bytes / 1024 / 1024]), erlang:start_timer(5000, self(), qps_ticker), {noreply, State#state{bytes = 0}}. diff --git a/apps/sdlan/src/test/stun_client.erl b/apps/sdlan/src/test/stun_client.erl index 9ee47bd..7601ea7 100644 --- a/apps/sdlan/src/test/stun_client.erl +++ b/apps/sdlan/src/test/stun_client.erl @@ -111,7 +111,7 @@ handle_call(register, _From, State = #state{socket = Socket, client_id = ClientI token = <<"1234567890">> }, - lager:debug("register is: ~p", [Register]), + logger:debug("register is: ~p", [Register]), Packet = jiffy:encode(Req, [force_utf8]), ok = gen_tcp:send(Socket, <<1:32, 101, Packet/binary>>), @@ -145,7 +145,7 @@ handle_info({tcp, Socket, <<1:32, 5, Data/binary>>}, State = #state{socket = Soc <<"lifetime">> := Lifetime } = Response, - lager:debug("[stun_client] get a register super response: ~p, alloc ip addr: ~p", [Response, sdlan_ipaddr:int_to_ipv4(NetAddr)]), + logger:debug("[stun_client] get a register super response: ~p, alloc ip addr: ~p", [Response, sdlan_ipaddr:int_to_ipv4(NetAddr)]), %% 开始注册自己的tun信息 gen_udp:send(TunSocket, "localhost", 1265, <<1, Cookie:32, ClientId/binary, NetworkId:32, NetAddr:32>>), @@ -153,36 +153,36 @@ handle_info({tcp, Socket, <<1:32, 5, Data/binary>>}, State = #state{socket = Soc {noreply, State#state{network_id = NetworkId, net_addr = NetAddr, mask_len = NetBitLen, aes_key = AesKey, cookie = Cookie + 1}}; handle_info({udp, _, _, _, <<2, Cookie:32, Family, Port:16, Ip0, Ip1, Ip2, Ip3>>}, State = #state{}) -> - lager:debug("[stun_client] tun register ack, cookie: ~p, ack: ~p", [Cookie, {Family, Port, {Ip0, Ip1, Ip2, Ip3}}]), + logger:debug("[stun_client] tun register ack, cookie: ~p, ack: ~p", [Cookie, {Family, Port, {Ip0, Ip1, Ip2, Ip3}}]), {noreply, State}; handle_info({udp, _, Ip, Port, <>}, State = #state{tun_socket = TunSocket, sessions = Sessions}) -> Packet = <>, - lager:debug("[stun_client] will send stun reply: ~p, peer: ~p", [Packet, {Ip, Port}]), + logger:debug("[stun_client] will send stun reply: ~p, peer: ~p", [Packet, {Ip, Port}]), ok = gen_udp:send(TunSocket, Ip, Port, Packet), NSessions = maps:put(SrcIp, {Ip, Port}, Sessions), {noreply, State#state{sessions = NSessions}}; handle_info({udp, _, Ip, Port, <>}, State = #state{sessions = Sessions}) -> - lager:debug("[stun_client] stun_data: network_id: ~p, src: ~p, dst: ~p, register_ack!!!", [NetworkId, SrcIp, DstIp]), + logger:debug("[stun_client] stun_data: network_id: ~p, src: ~p, dst: ~p, register_ack!!!", [NetworkId, SrcIp, DstIp]), NSessions = maps:put(SrcIp, {Ip, Port}, Sessions), {noreply, State#state{sessions = NSessions}}; handle_info({udp, _, _Ip0, _Port0, <>}, State = #state{tun_socket = TunSocket, sessions = Sessions}) -> - lager:debug("[stun_client] stun_data: network_id: ~p, src: ~p, dst: ~p, data!!!", [NetworkId, SrcIp, DstIp]), + logger:debug("[stun_client] stun_data: network_id: ~p, src: ~p, dst: ~p, data!!!", [NetworkId, SrcIp, DstIp]), case maps:is_key(SrcIp, Sessions) of true -> {Ip, Port} = maps:get(SrcIp, Sessions), ok = gen_udp:send(TunSocket, Ip, Port, <>), - lager:debug("[stun_client] stun_data: network_id: ~p, src: ~p, dst: ~p, reply data!!!", [NetworkId, SrcIp, DstIp]); + logger:debug("[stun_client] stun_data: network_id: ~p, src: ~p, dst: ~p, reply data!!!", [NetworkId, SrcIp, DstIp]); false -> - lager:debug("[stun_client] stun_data: network_id: ~p, src: ~p, dst: ~p, no session", [NetworkId, SrcIp, DstIp]) + logger:debug("[stun_client] stun_data: network_id: ~p, src: ~p, dst: ~p, no session", [NetworkId, SrcIp, DstIp]) end, {noreply, State}; handle_info(Info, State = #state{}) -> - lager:debug("[stun_client] get info: ~p", [Info]), + logger:debug("[stun_client] get info: ~p", [Info]), {noreply, State}. %% @private