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

fix: alway use os:system_time/1 when managing traces

This commit is contained in:
zhongwencool 2022-10-26 10:07:44 +08:00
parent 0d903eb2e1
commit 81d4bd10a3
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/emqx_plugin_libs/src/emqx_trace/emqx_trace.erl
View File

@ -36,6 +36,7 @@
, delete/1 , delete/1
, clear/0 , clear/0
, update/2 , update/2
, os_now/0
]). ]).
-export([ format/1 -export([ format/1
@ -515,6 +516,6 @@ set_log_primary_level(NewLevel) ->
false -> ok false -> ok
end. end.
%% the dashboard use os time to create trace, donot use erlang:system_time/1 %% the dashboard use os time to create trace, do not use erlang:system_time/1
os_now() -> os_now() ->
os:system_time(second). os:system_time(second).

2
apps/emqx_plugin_libs/src/emqx_trace/emqx_trace_api.erl
View File

@ -44,7 +44,7 @@ list_trace(_, _Params) ->
Nodes = ekka_mnesia:running_nodes(), Nodes = ekka_mnesia:running_nodes(),
TraceSize = cluster_call(?MODULE, get_trace_size, [], 30000), TraceSize = cluster_call(?MODULE, get_trace_size, [], 30000),
AllFileSize = lists:foldl(fun(F, Acc) -> maps:merge(Acc, F) end, #{}, TraceSize), AllFileSize = lists:foldl(fun(F, Acc) -> maps:merge(Acc, F) end, #{}, TraceSize),
Now = erlang:system_time(second), Now = emqx_trace:os_now(),
Traces = Traces =
lists:map(fun(Trace = #{name := Name, start_at := Start, lists:map(fun(Trace = #{name := Name, start_at := Start,
end_at := End, enable := Enable, type := Type, filter := Filter}) -> end_at := End, enable := Enable, type := Type, filter := Filter}) ->