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

fix: use os:system_time replace erlang:system_time in trace's start_at/end_at

This commit is contained in:
zhongwencool 2022-10-14 16:07:35 +08:00
parent 3dd2084c2e
commit 4e4f72d479
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -156,7 +156,7 @@ update(Name, Enable) ->
[] -> mnesia:abort(not_found); [] -> mnesia:abort(not_found);
[#?TRACE{enable = Enable}] -> ok; [#?TRACE{enable = Enable}] -> ok;
[Rec] -> [Rec] ->
case erlang:system_time(second) >= Rec#?TRACE.end_at of case os:system_time(second) >= Rec#?TRACE.end_at of
false -> mnesia:write(?TRACE, Rec#?TRACE{enable = Enable}, write); false -> mnesia:write(?TRACE, Rec#?TRACE{enable = Enable}, write);
true -> mnesia:abort(finished) true -> mnesia:abort(finished)
end end
@ -291,7 +291,7 @@ insert_new_trace(Trace) ->
transaction(Tran). transaction(Tran).
update_trace(Traces) -> update_trace(Traces) ->
Now = erlang:system_time(second), Now = os:system_time(second),
{_Waiting, Running, Finished} = classify_by_time(Traces, Now), {_Waiting, Running, Finished} = classify_by_time(Traces, Now),
disable_finished(Finished), disable_finished(Finished),
Started = emqx_trace_handler:running(), Started = emqx_trace_handler:running(),
@ -418,7 +418,7 @@ ensure_map(Trace) when is_list(Trace) ->
end, #{}, Trace). end, #{}, Trace).
fill_default(Trace = #?TRACE{start_at = undefined}) -> fill_default(Trace = #?TRACE{start_at = undefined}) ->
fill_default(Trace#?TRACE{start_at = erlang:system_time(second)}); fill_default(Trace#?TRACE{start_at = os:system_time(second)});
fill_default(Trace = #?TRACE{end_at = undefined, start_at = StartAt}) -> fill_default(Trace = #?TRACE{end_at = undefined, start_at = StartAt}) ->
fill_default(Trace#?TRACE{end_at = StartAt + 10 * 60}); fill_default(Trace#?TRACE{end_at = StartAt + 10 * 60});
fill_default(Trace) -> Trace. fill_default(Trace) -> Trace.
@ -454,7 +454,7 @@ to_trace(#{start_at := StartAt} = Trace, Rec) ->
{error, Reason} -> {error, Reason} {error, Reason} -> {error, Reason}
end; end;
to_trace(#{end_at := EndAt} = Trace, Rec) -> to_trace(#{end_at := EndAt} = Trace, Rec) ->
Now = erlang:system_time(second), Now = os:system_time(second),
case to_system_second(EndAt) of case to_system_second(EndAt) of
{ok, Sec} when Sec > Now -> {ok, Sec} when Sec > Now ->
to_trace(maps:remove(end_at, Trace), Rec#?TRACE{end_at = Sec}); to_trace(maps:remove(end_at, Trace), Rec#?TRACE{end_at = Sec});
@ -481,7 +481,7 @@ validate_ip_address(IP) ->
to_system_second(At) -> to_system_second(At) ->
try try
Sec = calendar:rfc3339_to_system_time(binary_to_list(At), [{unit, second}]), Sec = calendar:rfc3339_to_system_time(binary_to_list(At), [{unit, second}]),
Now = erlang:system_time(second), Now = os:system_time(second),
{ok, erlang:max(Now, Sec)} {ok, erlang:max(Now, Sec)}
catch error: {badmatch, _} -> catch error: {badmatch, _} ->
{error, ["The rfc3339 specification not satisfied: ", At]} {error, ["The rfc3339 specification not satisfied: ", At]}