From b167926e25703dee12233242cea7838ec4d25f6b Mon Sep 17 00:00:00 2001 From: maike Date: Thu, 24 Sep 2020 12:04:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E6=97=B6=E6=97=B6=E9=97=B4=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- src/agHttpCli/agHttpCli.erl | 2 +- src/agHttpCli/agSslAgencyIns.erl | 4 ++-- src/agHttpCli/agTcpAgencyIns.erl | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 7041269..777b42e 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Make a connection first {ok, Socket} = agHttpCli:connect([]). %% Use default Settings %% Then you can then call various apis using Socket as the first argument - agMgrDb:curDbInfo(S). + agMgrDb:curDbInfo(Socket). Connection pooling mode application:ensure_all_started(erlArango). %% start app diff --git a/src/agHttpCli/agHttpCli.erl b/src/agHttpCli/agHttpCli.erl index e298020..522de90 100644 --- a/src/agHttpCli/agHttpCli.erl +++ b/src/agHttpCli/agHttpCli.erl @@ -66,7 +66,7 @@ castAgency(PoolNameOrSocket, Method, Path, Headers, Body, Pid, IsSystem, Timeout case Timeout of infinity -> infinity; _ -> - erlang:system_time(millisecond) + Timeout + erlang:monotonic_time(millisecond) + Timeout end, case erlang:is_atom(PoolNameOrSocket) of true -> diff --git a/src/agHttpCli/agSslAgencyIns.erl b/src/agHttpCli/agSslAgencyIns.erl index 94da077..40b4788 100644 --- a/src/agHttpCli/agSslAgencyIns.erl +++ b/src/agHttpCli/agSslAgencyIns.erl @@ -183,7 +183,7 @@ overAllWork(SrvState, #cliState{requestsIns = RequestsIns, requestsOuts = Reques overDealQueueRequest(#miRequest{method = Method, path = Path, headers = Headers, body = Body, requestId = RequestId, fromPid = FromPid, overTime = OverTime, isSystem = IsSystem}, #srvState{serverName = ServerName, host = Host, userPassWord = UserPassWord, dbName = DbName, socket = Socket} = SrvState, #cliState{requestsIns = RequestsIns, requestsOuts = RequestsOuts, backlogNum = BacklogNum} = CliState) -> - case erlang:system_time(millisecond) > OverTime of + case erlang:monotonic_time(millisecond) > OverTime of true -> %% 超时了 agAgencyUtils:agencyReply(FromPid, RequestId, undefined, {error, timeout}), @@ -359,7 +359,7 @@ dealConnect(ServerName, HostName, Port, SocketOptions) -> dealQueueRequest(#miRequest{method = Method, path = Path, headers = Headers, body = Body, requestId = RequestId, fromPid = FromPid, overTime = OverTime, isSystem = IsSystem}, #srvState{serverName = ServerName, host = Host, userPassWord = UserPassWord, dbName = DbName, socket = Socket} = SrvState, #cliState{requestsIns = RequestsIns, requestsOuts = RequestsOuts, backlogNum = BacklogNum} = CliState) -> - case erlang:system_time(millisecond) > OverTime of + case erlang:monotonic_time(millisecond) > OverTime of true -> %% 超时了 agAgencyUtils:agencyReply(FromPid, RequestId, undefined, {error, timeout}), diff --git a/src/agHttpCli/agTcpAgencyIns.erl b/src/agHttpCli/agTcpAgencyIns.erl index 3753856..6307683 100644 --- a/src/agHttpCli/agTcpAgencyIns.erl +++ b/src/agHttpCli/agTcpAgencyIns.erl @@ -182,7 +182,7 @@ overAllWork(SrvState, #cliState{requestsIns = RequestsIns, requestsOuts = Reques overDealQueueRequest(#miRequest{method = Method, path = Path, headers = Headers, body = Body, requestId = RequestId, fromPid = FromPid, overTime = OverTime, isSystem = IsSystem}, #srvState{serverName = ServerName, host = Host, userPassWord = UserPassWord, dbName = DbName, socket = Socket} = SrvState, #cliState{requestsIns = RequestsIns, requestsOuts = RequestsOuts, backlogNum = BacklogNum} = CliState) -> - case erlang:system_time(millisecond) > OverTime of + case erlang:monotonic_time(millisecond) > OverTime of true -> %% 超时了 agAgencyUtils:agencyReply(FromPid, RequestId, undefined, {error, timeout}), @@ -358,7 +358,7 @@ dealConnect(ServerName, HostName, Port, SocketOptions) -> dealQueueRequest(#miRequest{method = Method, path = Path, headers = Headers, body = Body, requestId = RequestId, fromPid = FromPid, overTime = OverTime, isSystem = IsSystem}, #srvState{serverName = ServerName, host = Host, userPassWord = UserPassWord, dbName = DbName, socket = Socket} = SrvState, #cliState{requestsIns = RequestsIns, requestsOuts = RequestsOuts, backlogNum = BacklogNum} = CliState) -> - case erlang:system_time(millisecond) > OverTime of + case erlang:monotonic_time(millisecond) > OverTime of true -> %% 超时了 agAgencyUtils:agencyReply(FromPid, RequestId, undefined, {error, timeout}),