yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(s3-client): make log levels saner

This commit is contained in:
Andrew Mayorov 2024-02-08 22:19:33 +01:00
parent 4ff04ab1f3
commit 8f66bd9ddf
No known key found for this signature in database
GPG Key ID: 2837C62ACFBFED5D
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apps/emqx_s3/src/emqx_s3_client.erl
View File

@ -278,10 +278,10 @@ request_fun(HttpPool, PoolType, MaxRetries) ->
end) end)
end. end.
ehttpc_request(HttpPool, Method, Request, Timeout, MaxRetries) -> ehttpc_request(Worker, Method, Request, Timeout, MaxRetries) ->
try timer:tc(fun() -> ehttpc:request(HttpPool, Method, Request, Timeout, MaxRetries) end) of try timer:tc(fun() -> ehttpc:request(Worker, Method, Request, Timeout, MaxRetries) end) of
{Time, {ok, StatusCode, RespHeaders}} -> {Time, {ok, StatusCode, RespHeaders}} ->
?SLOG(info, #{ ?SLOG(debug, #{
msg => "s3_ehttpc_request_ok", msg => "s3_ehttpc_request_ok",
status_code => StatusCode, status_code => StatusCode,
headers => RespHeaders, headers => RespHeaders,
@ -291,7 +291,7 @@ ehttpc_request(HttpPool, Method, Request, Timeout, MaxRetries) ->
{StatusCode, undefined}, headers_ehttpc_to_erlcloud_response(RespHeaders), undefined {StatusCode, undefined}, headers_ehttpc_to_erlcloud_response(RespHeaders), undefined
}}; }};
{Time, {ok, StatusCode, RespHeaders, RespBody}} -> {Time, {ok, StatusCode, RespHeaders, RespBody}} ->
?SLOG(info, #{ ?SLOG(debug, #{
msg => "s3_ehttpc_request_ok", msg => "s3_ehttpc_request_ok",
status_code => StatusCode, status_code => StatusCode,
headers => RespHeaders, headers => RespHeaders,
@ -302,31 +302,31 @@ ehttpc_request(HttpPool, Method, Request, Timeout, MaxRetries) ->
{StatusCode, undefined}, headers_ehttpc_to_erlcloud_response(RespHeaders), RespBody {StatusCode, undefined}, headers_ehttpc_to_erlcloud_response(RespHeaders), RespBody
}}; }};
{Time, {error, Reason}} -> {Time, {error, Reason}} ->
?SLOG(error, #{ ?SLOG(warning, #{
msg => "s3_ehttpc_request_fail", msg => "s3_ehttpc_request_fail",
reason => Reason, reason => Reason,
timeout => Timeout, timeout => Timeout,
pool => HttpPool, worker => Worker,
method => Method, method => Method,
time => Time time => Time
}), }),
{error, Reason} {error, Reason}
catch catch
error:badarg -> error:badarg ->
?SLOG(error, #{ ?SLOG(warning, #{
msg => "s3_ehttpc_request_fail", msg => "s3_ehttpc_request_fail",
reason => badarg, reason => badarg,
timeout => Timeout, timeout => Timeout,
pool => HttpPool, worker => Worker,
method => Method method => Method
}), }),
{error, no_ehttpc_pool}; {error, no_ehttpc_pool};
error:Reason -> error:Reason ->
?SLOG(error, #{ ?SLOG(warning, #{
msg => "s3_ehttpc_request_fail", msg => "s3_ehttpc_request_fail",
reason => Reason, reason => Reason,
timeout => Timeout, timeout => Timeout,
pool => HttpPool, worker => Worker,
method => Method method => Method
}), }),
{error, Reason} {error, Reason}