ft: 代码添加

include/agVstCli.hrl

@@ -53,7 +53,7 @@
 -ifdef(debug).
 -define(AgDebug(Tag, Format, Data), error_logger:info_msg("[~p] " ++ Format, [Tag | Data])).
 -else.
--define(AgDebug(_Tag, _Format, _Data), ignore).
+-define(AgDebug(_Tag, _Format, _Data), notDebug).
 -endif.
 
 -define(AgMDoDBConn, mDoDBConn).

src/agTest.erl

@@ -12,6 +12,9 @@ start() ->
 stop() ->
    eArango:closePool(tt).
 
+isDebug() ->
+   ?AgDebug(test, "IMY**************", []).
+
 tt(C, N) ->
    application:ensure_all_started(eArango),
    eArango:openPool(tt, [{poolSize, 1}], []),

src/agVstCli/agVstCli.erl

@@ -24,24 +24,23 @@
    , receiveSslData/2
 ]).
 
-
--spec callAgency(poolNameOrSocket(), method(), path()) -> term() | {error, term()}.
+-spec callAgency(poolNameOrSocket(), method(), path()) -> eArango:dbRet().
 callAgency(PoolNameOrSocket, Method, Path) ->
    callAgency(PoolNameOrSocket, Method, Path, ?AgDefQuery, ?AgDefHeader, ?AgDefBody, false, ?AgDefTimeout).
 
--spec callAgency(poolNameOrSocket(), method(), path(), queryPars()) -> term() | {error, term()}.
+-spec callAgency(poolNameOrSocket(), method(), path(), queryPars()) -> eArango:dbRet().
 callAgency(PoolNameOrSocket, Method, Path, QueryPars) ->
    callAgency(PoolNameOrSocket, Method, Path, QueryPars, ?AgDefHeader, ?AgDefBody, false, ?AgDefTimeout).
 
--spec callAgency(poolNameOrSocket(), method(), path(), queryPars(), headers(), body()) -> term() | {error, term()}.
+-spec callAgency(poolNameOrSocket(), method(), path(), queryPars(), headers(), body()) -> eArango:dbRet().
 callAgency(PoolNameOrSocket, Method, Path, QueryPars, Headers, Body) ->
    callAgency(PoolNameOrSocket, Method, Path, QueryPars, Headers, Body, false, ?AgDefTimeout).
 
--spec callAgency(poolNameOrSocket(), method(), path(), queryPars(), headers(), body(), boolean()) -> term() | {error, atom()}.
+-spec callAgency(poolNameOrSocket(), method(), path(), queryPars(), headers(), body(), boolean()) -> eArango:dbRet().
 callAgency(PoolNameOrSocket, Method, Path, QueryPars, Headers, Body, IsSystem) ->
    callAgency(PoolNameOrSocket, Method, Path, QueryPars, Headers, Body, IsSystem, ?AgDefTimeout).
 
--spec callAgency(poolNameOrSocket(), method(), path(), queryPars(), headers(), body(), boolean(), timeout()) -> term() | {error, atom()}.
+-spec callAgency(poolNameOrSocket(), method(), path(), queryPars(), headers(), body(), boolean(), timeout()) -> eArango:dbRet().
 callAgency(PoolNameOrSocket, Method, Path, QueryPars, Headers, Body, IsSystem, Timeout) ->
    case castAgency(PoolNameOrSocket, Method, Path, QueryPars, Headers, Body, self(), IsSystem, Timeout) of
       {waitRRT, RequestId, MonitorRef} ->
@@ -121,7 +120,7 @@ receiveReqRet(RequestId, MonitorRef) ->
       #agReqRet{messageId = RequestId, reply = Reply} ->
          erlang:demonitor(MonitorRef),
          case Reply of
-            {error, Err} ->
+            {error, _} = Err ->
                Err;
             _ ->
                {[_1, _2, StatusCode, HeaderMap], BodyMap} = eVPack:decodeAll(Reply),

src/eArango.erl

@@ -21,6 +21,9 @@
 
 ]).
 
+-export_type([dbRet/0]).
+-type(dbRet() :: {StatusCode :: non_neg_integer(), Body :: map(), Headers :: map()} | {error, term()}).
+
 start() ->
    application:ensure_all_started(eArango).