Browse Source

适配 vst 协议

master
SisMaker 4 years ago
parent
commit
172299f930
3 changed files with 3 additions and 6 deletions
  1. +0
    -1
      src/agVstCli/agTcpAgencyIns.erl
  2. +2
    -4
      src/agVstCli/agVstCli.erl
  3. +1
    -1
      src/agVstCli/agVstProto.erl

+ 0
- 1
src/agVstCli/agTcpAgencyIns.erl View File

@ -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]),

+ 2
- 4
src/agVstCli/agVstCli.erl View File

@ -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 ->

+ 1
- 1
src/agVstCli/agVstProto.erl View File

@ -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),

Loading…
Cancel
Save