SisMaker
/
eArango
1
0
Rozštěpit 0
Zdrojový kód Úkoly 0 Požadavky na natažení 0 Projekty 0 Vydání 0 Wiki Aktivita
Procházet zdrojové kódy

rf: 日志答应调整

master
SisMaker před 3 roky
rodič
f3053c9d75
revize
dbc0dfb415
7 změnil soubory, kde provedl 43 přidání a 36 odebrání
Rozdělené zobrazení
Možnosti rozdílového porovnání
Zobrazit statistiky Stáhněte soubor opravy Stáhněte rozdílový soubor
  1. +10
    -2
      include/agVstCli.hrl
  2. +3
    -3
      src/agVstCli/agAgencyPoolMgr.erl
  3. +8
    -8
      src/agVstCli/agSslAgency.erl
  4. +12
    -12
      src/agVstCli/agTcpAgency.erl
  5. +3
    -3
      src/agVstCli/agVstCli.erl
  6. +1
    -2
      src/agVstCli/agVstProto.erl
  7. +6
    -6
      src/eArango.erl

+ 10
- 2
include/agVstCli.hrl Zobrazit soubor

@ -1,7 +1,6 @@
%% agency 管理进程的名称
-define(agAgencyPoolMgr, agAgencyPoolMgr).
-define(agBeamPool, agBeamPool).
-define(agBeamAgency, agBeamAgency).
@ -46,7 +45,16 @@
-define(AgGetListKV(Key, List), agMiscUtils:getListValue(Key, List, undefined)).
-define(AgGetListKV(Key, List, Default), agMiscUtils:getListValue(Key, List, Default)).
-define(AgWarn(Tag, Format, Data), agMiscUtils:warnMsg(Tag, Format, Data)).
-define(AgWarn(Tag, Format, Data), error_logger:warning_msg("[~p] " ++ Format, [Tag | Data])).
-define(AgInfo(Tag, Format, Data), error_logger:info_msg("[~p] " ++ Format, [Tag | Data])).
-define(AgErr(Tag, Format, Data), error_logger:error_msg("[~p] " ++ Format, [Tag | Data])).
-ifdef(debug).
-define(AgDebug(Tag, Format, Data), error_logger:info_msg("[~p] " ++ Format, [Tag | Data])).
-else.
-define(AgDebug(_Tag, _Format, _Data), ignore).
-endif.
-define(AgMDoDBConn, mDoDBConn).
-define(AgUpgradeInfo, <<"VST/1.1\r\n\r\n">>).

+ 3
- 3
src/agVstCli/agAgencyPoolMgr.erl Zobrazit soubor

@ -113,7 +113,7 @@ handleMsg({'$gen_call', From, {miStopPool, Name}}, State) ->
gen_server:reply(From, ok),
{ok, State};
handleMsg(_Msg, State) ->
?AgWarn(?MODULE, "receive unexpected msg: ~p", [_Msg]),
?AgErr(?MODULE, "receive unexpected msg: ~p", [_Msg]),
{ok, State}.
terminate(Reason, _State) ->
@ -198,13 +198,13 @@ stopChildren([AgencyName | T]) ->
ok ->
ok;
{error, TerReason} ->
?AgWarn(agAgencyPoolMgr, ":terminate_child: ~p error reason: ~p ~n", [AgencyName, TerReason])
?AgErr(agAgencyPoolMgr, ":terminate_child: ~p error reason: ~p ~n", [AgencyName, TerReason])
end,
case supervisor:delete_child(agAgencyPool_sup, AgencyName) of
ok ->
ok;
{error, DelReason} ->
?AgWarn(agAgencyPoolMgr, ":delete_child: ~p error reason: ~p ~n", [AgencyName, DelReason])
?AgErr(agAgencyPoolMgr, ":delete_child: ~p error reason: ~p ~n", [AgencyName, DelReason])
end,
stopChildren(T);
stopChildren([]) ->

+ 8
- 8
src/agVstCli/agSslAgency.erl Zobrazit soubor

@ -109,7 +109,7 @@ handleMsg(#agReq{method = Method, path = Path, queryPars = QueryPars, headers =
erlang:put(MessageId, {FromPid, TimerRef, 0, <<>>}),
{ok, SrvState, CliState#cliState{backlogNum = BacklogNum + 1}};
{error, Reason} ->
?AgWarn(ServerName, ":send error: ~p ~p ~p ~n", [Reason, FromPid, MessageId]),
?AgErr(ServerName, ":send error: ~p ~p ~p ~n", [Reason, FromPid, MessageId]),
ssl:close(Socket),
agAgencyUtils:agencyReply(FromPid, undefined, MessageId, {error, {socketSendError, Reason}}),
agAgencyUtils:dealClose(SrvState, CliState, {error, {socketSendError, Reason}})
@ -138,13 +138,13 @@ handleMsg({timeout, _TimerRef, {mWaitingOver, MessageId, FromPid}}, SrvState,
handleMsg({ssl_closed, Socket},
#srvState{socket = Socket, serverName = ServerName} = SrvState,
CliState) ->
?AgWarn(ServerName, "connection closed~n", []),
?AgInfo(ServerName, "connection closed~n", []),
ssl:close(Socket),
agAgencyUtils:dealClose(SrvState, CliState, {error, ssl_closed});
handleMsg({ssl_error, Socket, Reason},
#srvState{socket = Socket, serverName = ServerName} = SrvState,
CliState) ->
?AgWarn(ServerName, "connection error: ~p~n", [Reason]),
?AgInfo(ServerName, "connection error: ~p~n", [Reason]),
ssl:close(Socket),
agAgencyUtils:dealClose(SrvState, CliState, {error, {ssl_error, Reason}});
handleMsg(?AgMDoDBConn,
@ -163,26 +163,26 @@ handleMsg(?AgMDoDBConn,
[1, 2, 200, _] ->
{ok, SrvState#srvState{dbName = DbName, reConnState = agAgencyUtils:resetReConnState(ReConnState), socket = Socket, vstSize = VstSize}, CliState};
_Err ->
?AgWarn(ServerName, "auth error: ~p~n", [_Err]),
?AgErr(ServerName, "auth error: ~p~n", [_Err]),
agAgencyUtils:reConnTimer(SrvState, CliState)
end;
{error, Reason} = Err ->
?AgWarn(ServerName, "recv auth error: ~p~n", [Reason]),
?AgErr(ServerName, "recv auth error: ~p~n", [Reason]),
Err
end;
{error, Reason} ->
?AgWarn(ServerName, "connect error: ~p~n", [Reason]),
?AgErr(ServerName, "connect error: ~p~n", [Reason]),
agAgencyUtils:reConnTimer(SrvState, CliState)
end;
_Ret ->
?AgWarn(ServerName, "deal connect not found agBeamPool:getv(~p) ret ~p is error ~n", [PoolName, _Ret])
?AgErr(ServerName, "deal connect not found agBeamPool:getv(~p) ret ~p is error ~n", [PoolName, _Ret])
end;
handleMsg({'$gen_call', FromTag, '$SrvInfo'}, SrvState, CliState) ->
{To, Tag} = FromTag,
catch To ! {Tag, {erlang:get(), SrvState, CliState}},
{ok, SrvState, CliState};
handleMsg(Msg, #srvState{serverName = ServerName} = SrvState, CliState) ->
?AgWarn(ServerName, "unknown msg: ~p~n", [Msg]),
?AgErr(ServerName, "unknown msg: ~p~n", [Msg]),
{ok, SrvState, CliState}.
-spec terminate(term(), srvState(), cliState()) -> ok.

+ 12
- 12
src/agVstCli/agTcpAgency.erl Zobrazit soubor

@ -98,12 +98,12 @@ handleMsg(#agReq{method = Method, path = Path, queryPars = QueryPars, headers =
{ok, SrvState, CliState};
_ ->
Request = agVstProto:request(IsSystem, MessageId, Method, DbName, Path, QueryPars, Headers, Body, VstSize),
BBBB = iolist_to_binary(Request),
?AgWarn(ServerName, "the request is:~p~n", [BBBB]),
?AgDebug(ServerName, "IMY************the request is:~s", [iolist_to_binary(Request)]),
%file:write_file("./request", BBBB),
%erlang:put(MessageId, {FromPid, undefined, 0, <<>>}),
%Ret = agVstProto:response(?AgUndef, 0, 0, 0, 0, <<>>, BBBB),
%?AgWarn(ServerName, "the request is response ret:~p~n", [Ret]),
%?AgErr(ServerName, "the request is response ret:~p~n", [Ret]),
case gen_tcp:send(Socket, Request) of
ok ->
TimerRef = case OverTime of
@ -115,7 +115,7 @@ handleMsg(#agReq{method = Method, path = Path, queryPars = QueryPars, headers =
erlang:put(MessageId, {FromPid, TimerRef, 0, <<>>}),
{ok, SrvState, CliState#cliState{backlogNum = BacklogNum + 1}};
{error, Reason} ->
?AgWarn(ServerName, ":send error: ~p ~p ~p ~n", [Reason, FromPid, MessageId]),
?AgErr(ServerName, ":send error: ~p ~p ~p ~n", [Reason, FromPid, MessageId]),
gen_tcp:close(Socket),
agAgencyUtils:agencyReply(FromPid, undefined, MessageId, {error, {socketSendError, Reason}}),
agAgencyUtils:dealClose(SrvState, CliState, {error, {socketSendError, Reason}})
@ -144,13 +144,13 @@ handleMsg({timeout, _TimerRef, {mWaitingOver, MessageId, FromPid}}, SrvState,
handleMsg({tcp_closed, Socket},
#srvState{socket = Socket, serverName = ServerName} = SrvState,
CliState) ->
?AgWarn(ServerName, "connection closed~n", []),
?AgInfo(ServerName, "connection closed~n", []),
gen_tcp:close(Socket),
agAgencyUtils:dealClose(SrvState, CliState, {error, tcp_closed});
handleMsg({tcp_error, Socket, Reason},
#srvState{socket = Socket, serverName = ServerName} = SrvState,
CliState) ->
?AgWarn(ServerName, "connection error: ~p~n", [Reason]),
?AgInfo(ServerName, "connection error: ~p~n", [Reason]),
gen_tcp:close(Socket),
agAgencyUtils:dealClose(SrvState, CliState, {error, {tcp_error, Reason}});
handleMsg(?AgMDoDBConn,
@ -167,29 +167,29 @@ handleMsg(?AgMDoDBConn,
{ok, MsgBin} ->
case eVPack:decodeHeader(MsgBin) of
[1, 2, 200, _] ->
?AgWarn(ServerName, "connect success: old server state:~n ~p~n client state~n ~p ~n", [SrvState, CliState]),
?AgDebug(ServerName, "IMY************ connect success: old server state:~n ~p~n client state~n ~p", [SrvState, CliState]),
{ok, SrvState#srvState{dbName = DbName, reConnState = agAgencyUtils:resetReConnState(ReConnState), socket = Socket, vstSize = VstSize}, CliState};
_Err ->
?AgWarn(ServerName, "auth error: ~p~n", [_Err]),
?AgErr(ServerName, "auth error: ~p~n", [_Err]),
agAgencyUtils:reConnTimer(SrvState, CliState)
end;
{error, Reason} = Err ->
?AgWarn(ServerName, "recv auth error: ~p~n", [Reason]),
?AgErr(ServerName, "recv auth error: ~p~n", [Reason]),
Err
end;
{error, Reason} ->
?AgWarn(ServerName, "connect error: ~p~n", [Reason]),
?AgErr(ServerName, "connect error: ~p~n", [Reason]),
agAgencyUtils:reConnTimer(SrvState, CliState)
end;
_Ret ->
?AgWarn(ServerName, "deal connect not found agBeamPool:getv(~p) ret ~p is error ~n", [PoolName, _Ret])
?AgErr(ServerName, "deal connect not found agBeamPool:getv(~p) ret ~p is error ~n", [PoolName, _Ret])
end;
handleMsg({'$gen_call', FromTag, '$SrvInfo'}, SrvState, CliState) ->
{To, Tag} = FromTag,
catch To ! {Tag, {erlang:get(), SrvState, CliState}},
{ok, SrvState, CliState};
handleMsg(Msg, #srvState{serverName = ServerName} = SrvState, CliState) ->
?AgWarn(ServerName, "unknown msg: ~p~n", [Msg]),
?AgErr(ServerName, "unknown msg: ~p~n", [Msg]),
{ok, SrvState, CliState}.
-spec terminate(term(), srvState(), cliState()) -> ok.

+ 3
- 3
src/agVstCli/agVstCli.erl Zobrazit soubor

@ -96,7 +96,7 @@ castAgency(PoolNameOrSocket, Method, Path, QueryPars, Headers, Body, Pid, IsSyst
ok ->
receiveTcpData(#recvState{}, PoolNameOrSocket);
{error, Reason} = Err ->
?AgWarn(castAgency, ":gen_tcp send error: ~p ~n", [Reason]),
?AgErr(castAgency, ":gen_tcp send error: ~p ~n", [Reason]),
eArango:disConnDb(PoolNameOrSocket),
Err
end;
@ -105,7 +105,7 @@ castAgency(PoolNameOrSocket, Method, Path, QueryPars, Headers, Body, Pid, IsSyst
ok ->
receiveSslData(#recvState{}, PoolNameOrSocket);
{error, Reason} = Err ->
?AgWarn(castAgency, ":ssl send error: ~p ~n", [Reason]),
?AgErr(castAgency, ":ssl send error: ~p ~n", [Reason]),
eArango:disConnDb(PoolNameOrSocket),
Err
end
@ -135,7 +135,7 @@ receiveReqRet(RequestId, MonitorRef) ->
receiveTcpData(RecvState, Socket) ->
receive
{tcp, Socket, DataBuffer} ->
%% ?AgWarn(1111, "IMY************receove 1: ~p ~p ~n", [erlang:byte_size(DataBuffer), DataBuffer]),
%% ?AgErr(1111, "IMY************receove 1: ~p ~p ~n", [erlang:byte_size(DataBuffer), DataBuffer]),
case agVstProto:response(element(2, RecvState), RecvState, DataBuffer) of
{?AgMDone, MsgBin} ->
{ok, MsgBin};

+ 1
- 2
src/agVstCli/agVstProto.erl Zobrazit soubor

@ -31,7 +31,6 @@ request(IsSystem, MessageId, Method, DbName, Path, QueryPars, Headers, Body, Vst
MsgSize = erlang:byte_size(MsgBin),
case MsgSize =< VstSize of
true ->
%% ?AgWarn(tt, "IMY************** ~p ~p ~p ~p~n", [MsgSize, MessageId, MsgSize, MsgBin]),
[<<(MsgSize + ?AgHeaderSize):32/integer-little-unsigned, 3:32/integer-little-unsigned, MessageId:64/integer-little-unsigned, MsgSize:64/integer-little-unsigned>>, MsgBin];
_ ->
ChunkCnt = erlang:ceil(MsgSize / VstSize),
@ -231,7 +230,7 @@ response(?AgCBody, DoneCnt, MessageId, ChunkIdx, ChunkSize, ChunkBuffer, DataBuf
response(?AgUndef, #recvState{chunkCnt = ChunkCnt, msgBuffer = MsgBuffer} = RecvState, DataBuffer) ->
case DataBuffer of
<<Length:32/integer-little-unsigned, ChunkX:31/integer-little-unsigned, IsFirst:1/integer-little-unsigned, MessageId:64/integer-little-unsigned, _MessageLength:64/integer-little-unsigned, LeftBuffer/binary>> ->
?AgWarn(1111, "response 1: ~p ~p ~p ~p ~p ~n", [ChunkX, IsFirst, MessageId, Length, _MessageLength]),
?AgDebug('IM**************', "response 1: ChunkX:~p IsFirst:~p MessageId:~p Length:~p _MessageLength:~p", [ChunkX, IsFirst, MessageId, Length, _MessageLength]),
ByteSize = erlang:byte_size(LeftBuffer),
ChunkSize = Length - ?AgHeaderSize,

+ 6
- 6
src/eArango.erl Zobrazit soubor

@ -64,15 +64,15 @@ connDb(DbCfgs) ->
setCurDbInfo(Socket, DbName, VstSize, Protocol),
{ok, Socket};
_Err ->
?AgWarn(connDb_tcp, "auth error: ~p~n", [_Err]),
?AgErr(connDb_tcp, "auth error: ~p~n", [_Err]),
{error, _Err}
end;
{error, Reason} = Err ->
?AgWarn(connDb_tcp, "recv error: ~p~n", [Reason]),
?AgErr(connDb_tcp, "recv error: ~p~n", [Reason]),
Err
end;
{error, Reason} = Err ->
?AgWarn(connDb_tcp, "connect error: ~p~n", [Reason]),
?AgErr(connDb_tcp, "connect error: ~p~n", [Reason]),
Err
end;
ssl ->
@ -88,15 +88,15 @@ connDb(DbCfgs) ->
setCurDbInfo(Socket, DbName, VstSize, Protocol),
{ok, Socket};
_Err ->
?AgWarn(connDb_ssl, "auth error: ~p~n", [_Err]),
?AgErr(connDb_ssl, "auth error: ~p~n", [_Err]),
{error, _Err}
end;
{error, Reason} = Err ->
?AgWarn(connDb_ssl, "recv error: ~p~n", [Reason]),
?AgErr(connDb_ssl, "recv error: ~p~n", [Reason]),
Err
end;
{error, Reason} = Err ->
?AgWarn(connDb_ssl, "connect error: ~p~n", [Reason]),
?AgErr(connDb_ssl, "connect error: ~p~n", [Reason]),
Err
end
end.

Zapsat Náhled
Načítá se…
Zrušit
Uložit