From 172299f930a17d6b876595b9d2bf320efdb4e0de Mon Sep 17 00:00:00 2001 From: SisMaker <1713699517@qq.com> Date: Sun, 6 Dec 2020 01:44:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=20vst=20=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/agVstCli/agTcpAgencyIns.erl | 1 - src/agVstCli/agVstCli.erl | 6 ++---- src/agVstCli/agVstProto.erl | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/agVstCli/agTcpAgencyIns.erl b/src/agVstCli/agTcpAgencyIns.erl index 9d84115..f11d3c0 100644 --- a/src/agVstCli/agTcpAgencyIns.erl +++ b/src/agVstCli/agTcpAgencyIns.erl @@ -97,7 +97,6 @@ handleMsg(?AgMDoDBConn, {ok, MsgBin} -> case eVPack:decode(MsgBin) of [1, 2, 200, _] -> - ?AgWarn(ServerName, "connect and auth success~n", []), {ok, SrvState#srvState{dbName = DbName, socket = Socket, vstSize = VstSize}, CliState}; _Err -> ?AgWarn(ServerName, "auth error: ~p~n", [_Err]), diff --git a/src/agVstCli/agVstCli.erl b/src/agVstCli/agVstCli.erl index 9622159..d4aca30 100644 --- a/src/agVstCli/agVstCli.erl +++ b/src/agVstCli/agVstCli.erl @@ -119,7 +119,7 @@ receiveReqRet(RequestId, MonitorRef) -> receive #agReqRet{messageId = RequestId, reply = Reply} -> erlang:demonitor(MonitorRef), - Reply; + eVpack:decode(Reply); {'DOWN', MonitorRef, process, _Pid, Reason} -> {error, {agencyDown, Reason}} end. @@ -128,7 +128,7 @@ receiveReqRet(RequestId, MonitorRef) -> receiveTcpData(RecvState, Socket) -> receive {tcp, Socket, DataBuffer} -> - ?AgWarn(1111, "IMY************receove 1: ~p ~p ~n", [erlang:byte_size(DataBuffer), DataBuffer]), + %% ?AgWarn(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}; @@ -203,7 +203,6 @@ connDb(DbCfgs) -> {ok, MsgBin} -> case eVPack:decode(MsgBin) of [1, 2, 200, _] -> - ?AgWarn(connDb_tcp, "connect and auth success~n", []), setCurDbInfo(Socket, DbName, VstSize, Protocol), {ok, Socket}; _Err -> @@ -228,7 +227,6 @@ connDb(DbCfgs) -> {ok, MsgBin} -> case eVPack:decode(MsgBin) of [1, 2, 200, _] -> - ?AgWarn(connDb_ssl, "connect and auth success~n", []), setCurDbInfo(Socket, DbName, VstSize, Protocol), {ok, Socket}; _Err -> diff --git a/src/agVstCli/agVstProto.erl b/src/agVstCli/agVstProto.erl index f12b92d..237f485 100644 --- a/src/agVstCli/agVstProto.erl +++ b/src/agVstCli/agVstProto.erl @@ -32,7 +32,7 @@ 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]), + %% ?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),