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

fix: 500 error response when downloading non-existent trace files

This commit is contained in:
zhongwencool 2023-10-12 15:23:23 +08:00
parent b1a3bc8565
commit 1021088f5f
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx_management/src/emqx_mgmt_api_trace.erl
View File

@ -552,6 +552,8 @@ group_trace_files(TraceLog, TraceFiles) ->
empty;
({ok, _Node, _Bin}) ->
nonempty;
({error, _Node, enoent}) ->
empty;
({error, Node, Reason}) ->
?SLOG(error, #{
msg => "download_trace_log_error",

11
apps/emqx_management/test/emqx_mgmt_api_trace_SUITE.erl
View File

@ -389,7 +389,16 @@ t_download_empty_trace(_Config) ->
),
{error, {{_, 404, _}, _Headers, Body}} =
request_api(get, api_path(<<"trace/", Name/binary, "/download">>), [], #{return_all => true}),
?assertMatch(#{<<"message">> := <<"Trace is empty">>}, emqx_utils_json:decode(Body)).
?assertMatch(#{<<"message">> := <<"Trace is empty">>}, emqx_utils_json:decode(Body)),
File = emqx_trace:log_file(Name, Now),
ct:pal("FileName: ~p", [File]),
?assertEqual({ok, <<>>}, file:read_file(File)),
?assertEqual(ok, file:delete(File)),
%% return 404 if trace file is not found
{error, {{_, 404, _}, _Headers, Body}} =
request_api(get, api_path(<<"trace/", Name/binary, "/download">>), [], #{return_all => true}),
?assertMatch(#{<<"message">> := <<"Trace is empty">>}, emqx_utils_json:decode(Body)),
ok.
to_rfc3339(Second) ->
list_to_binary(calendar:system_time_to_rfc3339(Second)).