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

fix: flip order of checks to return 404 before 400

This commit is contained in:
Stefan Strigler 2022-12-09 10:29:18 +01:00
parent 1f7c02ecf5
commit 1472cfefd0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -451,10 +451,10 @@ update_trace(put, #{bindings := #{name := Name}}) ->
%% if HTTP request headers include accept-encoding: gzip and file size > 300 bytes. %% if HTTP request headers include accept-encoding: gzip and file size > 300 bytes.
%% cowboy_compress_h will auto encode gzip format. %% cowboy_compress_h will auto encode gzip format.
download_trace_log(get, #{bindings := #{name := Name}, query_string := Query}) -> download_trace_log(get, #{bindings := #{name := Name}, query_string := Query}) ->
case parse_node(Query, undefined) of
{ok, Node} ->
case emqx_trace:get_trace_filename(Name) of case emqx_trace:get_trace_filename(Name) of
{ok, TraceLog} -> {ok, TraceLog} ->
case parse_node(Query, undefined) of
{ok, Node} ->
TraceFiles = collect_trace_file(Node, TraceLog), TraceFiles = collect_trace_file(Node, TraceLog),
ZipDir = emqx_trace:zip_dir(), ZipDir = emqx_trace:zip_dir(),
Zips = group_trace_file(ZipDir, TraceLog, TraceFiles), Zips = group_trace_file(ZipDir, TraceLog, TraceFiles),
@ -474,10 +474,10 @@ download_trace_log(get, #{bindings := #{name := Name}, query_string := Query}) -
}, },
{200, Headers, {file_binary, ZipName, Binary}}; {200, Headers, {file_binary, ZipName, Binary}};
{error, not_found} -> {error, not_found} ->
?NOT_FOUND(Name) ?BAD_REQUEST('NODE_ERROR', <<"Node not found">>)
end; end;
{error, not_found} -> {error, not_found} ->
?BAD_REQUEST('NODE_ERROR', <<"Node not found">>) ?NOT_FOUND(Name)
end. end.
group_trace_file(ZipDir, TraceLog, TraceFiles) -> group_trace_file(ZipDir, TraceLog, TraceFiles) ->