diff --git a/src/agVstCli/agVstCli.erl b/src/agVstCli/agVstCli.erl index d2e340f..07cf375 100644 --- a/src/agVstCli/agVstCli.erl +++ b/src/agVstCli/agVstCli.erl @@ -93,7 +93,7 @@ castAgency(PoolNameOrSocket, Method, Path, QueryPars, Headers, Body, Pid, IsSyst tcp -> case gen_tcp:send(PoolNameOrSocket, Request) of ok -> - receiveTcpData(#recvState{}, PoolNameOrSocket); + receiveTcpData(#recvState{messageId = MessageId}, PoolNameOrSocket); _Err -> ?AgErr(castAgency, ":gen_tcp send error: ~p ~n", [_Err]), eArango:disConnDb(PoolNameOrSocket), @@ -102,7 +102,7 @@ castAgency(PoolNameOrSocket, Method, Path, QueryPars, Headers, Body, Pid, IsSyst ssl -> case ssl:send(PoolNameOrSocket, Request) of ok -> - receiveSslData(#recvState{}, PoolNameOrSocket); + receiveSslData(#recvState{messageId = MessageId}, PoolNameOrSocket); _Err -> ?AgErr(castAgency, ":ssl send error: ~p ~n", [_Err]), eArango:disConnDb(PoolNameOrSocket), @@ -124,7 +124,7 @@ receiveReqRet(RequestId, MonitorRef) -> Err; _ -> {[_1, _2, StatusCode, HeaderMap], BodyMap} = eVPack:decodeAll(Reply), - ?AgDebug('IMY******response', " StatusCode:~p BodyMap:~p, HeaderMap:~p", [StatusCode, BodyMap, HeaderMap]), + ?AgDebug('IMY******response', "MessageId:~p Time:~p StatusCode:~p BodyMap:~p, HeaderMap:~p", [RequestId, erlang:system_time(second), StatusCode, BodyMap, HeaderMap]), {StatusCode, BodyMap, HeaderMap} end; {'DOWN', MonitorRef, process, _Pid, Reason} -> @@ -138,7 +138,7 @@ receiveTcpData(RecvState, Socket) -> case agVstProto:response(element(2, RecvState), RecvState, DataBuffer) of {?AgMDone, MsgBin} -> {[_1, _2, StatusCode, HeaderMap], BodyMap} = eVPack:decodeAll(MsgBin), - ?AgDebug('IMY******response', " StatusCode:~p BodyMap:~p, HeaderMap:~p", [StatusCode, BodyMap, HeaderMap]), + ?AgDebug('IMY******response', "MessageId:~p Time:~p StatusCode:~p BodyMap:~p, HeaderMap:~p", [RecvState#recvState.messageId, erlang:system_time(second), StatusCode, BodyMap, HeaderMap]), {StatusCode, BodyMap, HeaderMap}; {?AgCHeader, NewRecvState} -> receiveTcpData(NewRecvState, Socket); @@ -162,7 +162,7 @@ receiveSslData(RecvState, Socket) -> case agVstProto:response(element(2, RecvState), RecvState, DataBuffer) of {?AgMDone, MsgBin} -> {[_1, _2, StatusCode, HeaderMap], BodyMap} = eVPack:decodeAll(MsgBin), - ?AgDebug('IMY******response', " StatusCode:~p BodyMap:~p, HeaderMap:~p", [StatusCode, BodyMap, HeaderMap]), + ?AgDebug('IMY******response', "MessageId:~p Time:~p StatusCode:~p BodyMap:~p, HeaderMap:~p", [RecvState#recvState.messageId, erlang:system_time(second), StatusCode, BodyMap, HeaderMap]), {StatusCode, BodyMap, HeaderMap}; {?AgCHeader, NewRecvState} -> receiveSslData(NewRecvState, Socket); diff --git a/src/agVstCli/agVstProto.erl b/src/agVstCli/agVstProto.erl index de8dea2..f3578d1 100644 --- a/src/agVstCli/agVstProto.erl +++ b/src/agVstCli/agVstProto.erl @@ -20,7 +20,7 @@ authInfo(User, Password) -> -spec request(boolean(), pos_integer(), method(), binary(), path(), queryPars(), headers(), body(), pos_integer()) -> iolist(). request(IsSystem, MessageId, Method, DbName, Path, QueryPars, Headers, Body, VstSize) -> - ?AgDebug('IMY******request', " IsSystem:~p MessageId:~p Method:~p, DbName:~p, Path:~p, QueryPars:~p, Headers:~p, Body:~p", [IsSystem, MessageId, agMiscUtils:agMethod(Method), DbName, Path, QueryPars, Headers, Body]), + ?AgDebug('IMY******request', "MessageId:~p Time:~p IsSystem:~p Method:~p, DbName:~p, Path:~p, QueryPars:~p, Headers:~p, Body:~p", [MessageId, erlang:system_time(second), IsSystem, agMiscUtils:agMethod(Method), DbName, Path, QueryPars, Headers, Body]), ReqBin = case IsSystem of