Browse Source

ft: 适配eNet修改

master
lijie 1 year ago
parent
commit
79dfd02de8
3 changed files with 6 additions and 6 deletions
  1. +3
    -3
      src/agVstCli/agTcpAgency.erl
  2. +1
    -1
      src/agVstCli/agVstCli.erl
  3. +2
    -2
      src/eArango.erl

+ 3
- 3
src/agVstCli/agTcpAgency.erl View File

@ -103,7 +103,7 @@ handleMsg(#agReq{method = Method, path = Path, queryPars = QueryPars, headers =
%erlang:put(MessageId, {FromPid, undefined, 0, <<>>}),
%Ret = agVstProto:response(?AgUndef, 0, 0, 0, 0, <<>>, BBBB),
%?AgErr(ServerName, "the request is response ret:~p~n", [Ret]),
case gen_tcp:send(Socket, Request) of
case ntCom:syncSend(Socket, Request) of
ok ->
TimerRef = case OverTime of
infinity ->
@ -159,9 +159,9 @@ handleMsg(?AgMDoDBConn,
#dbOpts{port = Port, hostname = HostName, dbName = DbName, user = User, password = Password, vstSize = VstSize} ->
case gen_tcp:connect(HostName, Port, ?AgDefSocketOpts, ?AgDefConnTimeout) of
{ok, Socket} ->
gen_tcp:send(Socket, ?AgUpgradeInfo),
ntCom:syncSend(Socket, ?AgUpgradeInfo),
AuthInfo = agVstProto:authInfo(User, Password),
gen_tcp:send(Socket, AuthInfo),
ntCom:syncSend(Socket, AuthInfo),
case agVstCli:receiveTcpData(#recvState{}, Socket) of
{200, _BodyMap, _HeaderMap} ->
{ok, SrvState#srvState{dbName = DbName, reConnState = agAgencyUtils:resetReConnState(ReConnState), socket = Socket, vstSize = VstSize}, CliState};

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

@ -91,7 +91,7 @@ castAgency(PoolNameOrSocket, Method, Path, QueryPars, Headers, Body, Pid, IsSyst
Request = agVstProto:request(IsSystem, MessageId, Method, DbName, Path, QueryPars, Headers, Body, VstSize),
case Protocol of
tcp ->
case gen_tcp:send(PoolNameOrSocket, Request) of
case ntCom:syncSend(PoolNameOrSocket, Request) of
ok ->
receiveTcpData(#recvState{messageId = MessageId}, PoolNameOrSocket);
_Err ->

+ 2
- 2
src/eArango.erl View File

@ -58,9 +58,9 @@ connDb(DbCfgs) ->
tcp ->
case gen_tcp:connect(HostName, Port, ?AgDefSocketOpts, ?AgDefConnTimeout) of
{ok, Socket} ->
gen_tcp:send(Socket, ?AgUpgradeInfo),
ntCom:syncSend(Socket, ?AgUpgradeInfo),
AuthInfo = agVstProto:authInfo(User, Password),
gen_tcp:send(Socket, AuthInfo),
ntCom:syncSend(Socket, AuthInfo),
case agVstCli:receiveTcpData(#recvState{}, Socket) of
{200, _BodyMap, _HeaderMap} ->
setCurDbInfo(Socket, DbName, VstSize, Protocol),

Loading…
Cancel
Save