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

fix(trace): don't return 500 when emqx_mod_trace not started.

This commit is contained in:
zhongwencool 2022-02-07 15:14:24 +08:00
parent 59ff3090f4
commit bcb15f2a95
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib-ce/emqx_modules/src/emqx_mod_trace_api.erl
View File

@ -70,20 +70,36 @@
func => stream_log_file,
descr => "download trace's log"}).
-define(NOT_STARTED, {error, module_not_loaded}).
list_trace(Path, Params) ->
return(emqx_trace_api:list_trace(Path, Params)).
case is_started() of
true -> return(emqx_trace_api:list_trace(Path, Params));
false -> return(?NOT_STARTED)
end.
create_trace(Path, Params) ->
return(emqx_trace_api:create_trace(Path, Params)).
case is_started() of
true -> return(emqx_trace_api:create_trace(Path, Params));
false -> return(?NOT_STARTED)
end.
delete_trace(Path, Params) ->
return(emqx_trace_api:delete_trace(Path, Params)).
case is_started() of
true -> return(emqx_trace_api:delete_trace(Path, Params));
false -> return(?NOT_STARTED)
end.
clear_traces(Path, Params) ->
return(emqx_trace_api:clear_traces(Path, Params)).
case is_started() of
true -> return(emqx_trace_api:clear_traces(Path, Params));
false -> return(?NOT_STARTED)
end.
disable_trace(#{name := Name}, Params) ->
return(emqx_trace_api:update_trace(#{name => Name, operation => disable}, Params)).
case is_started() of
true -> return(emqx_trace_api:update_trace(#{name => Name, operation => disable}, Params));
false -> return(?NOT_STARTED)
end.
download_zip_log(Path, Params) ->
case emqx_trace_api:download_zip_log(Path, Params) of
@ -96,3 +112,6 @@ stream_log_file(Path, Params) ->
{ok, File} -> return({ok, File});
{error, Reason} -> return({error, 'NOT_FOUND', Reason})
end.
is_started() ->
undefined =/= erlang:whereis(emqx_trace).

6
lib-ce/emqx_modules/src/emqx_modules.appup.src
View File

@ -2,12 +2,14 @@
{VSN,
[{"4.4.0",
[{load_module, emqx_mod_presence, brutal_purge, soft_purge, []},
{load_module, emqx_mod_sup, brutal_purge, soft_purge, []}]},
{load_module, emqx_mod_sup, brutal_purge, soft_purge, []},
{load_module, emqx_mod_trace_api, brutal_purge, soft_purge, []}]},
{<<".*">>, []}
],
[{"4.4.0",
[{load_module, emqx_mod_presence, brutal_purge, soft_purge, []},
{load_module, emqx_mod_sup, brutal_purge, soft_purge, []}]},
{load_module, emqx_mod_sup, brutal_purge, soft_purge, []},
{load_module, emqx_mod_trace_api, brutal_purge, soft_purge, []}]},
{<<".*">>, []}
]
}.