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

Change timestamps to millisecond

This commit is contained in:
terry-xiaoyu 2020-04-15 09:03:52 +08:00
parent 9ba938b9d9
commit e806a96031
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/emqx_alarm_handler.erl
View File

@ -105,7 +105,7 @@ init(_) ->
{ok, []}. {ok, []}.
handle_event({set_alarm, {AlarmId, AlarmDesc = #alarm{timestamp = undefined}}}, State) -> handle_event({set_alarm, {AlarmId, AlarmDesc = #alarm{timestamp = undefined}}}, State) ->
handle_event({set_alarm, {AlarmId, AlarmDesc#alarm{timestamp = erlang:system_time(second)}}}, State); handle_event({set_alarm, {AlarmId, AlarmDesc#alarm{timestamp = erlang:system_time(millisecond)}}}, State);
handle_event({set_alarm, Alarm = {AlarmId, AlarmDesc}}, State) -> handle_event({set_alarm, Alarm = {AlarmId, AlarmDesc}}, State) ->
?LOG(warning, "New Alarm: ~p, Alarm Info: ~p", [AlarmId, AlarmDesc]), ?LOG(warning, "New Alarm: ~p, Alarm Info: ~p", [AlarmId, AlarmDesc]),
case encode_alarm(Alarm) of case encode_alarm(Alarm) of
@ -199,5 +199,5 @@ clear_alarm_(Id) ->
set_alarm_history(Id, Desc) -> set_alarm_history(Id, Desc) ->
His = #alarm_history{id = Id, His = #alarm_history{id = Id,
desc = Desc, desc = Desc,
clear_at = erlang:system_time(second)}, clear_at = erlang:system_time(millisecond)},
mnesia:dirty_write(?ALARM_HISTORY_TAB, His). mnesia:dirty_write(?ALARM_HISTORY_TAB, His).

4
src/emqx_channel.erl
View File

@ -1345,7 +1345,7 @@ enrich_assigned_clientid(AckProps, #channel{conninfo = ConnInfo,
ensure_connected(Channel = #channel{conninfo = ConnInfo, ensure_connected(Channel = #channel{conninfo = ConnInfo,
clientinfo = ClientInfo}) -> clientinfo = ClientInfo}) ->
NConnInfo = ConnInfo#{connected_at => erlang:system_time(second)}, NConnInfo = ConnInfo#{connected_at => erlang:system_time(millisecond)},
ok = run_hooks('client.connected', [ClientInfo, NConnInfo]), ok = run_hooks('client.connected', [ClientInfo, NConnInfo]),
Channel#channel{conninfo = NConnInfo, Channel#channel{conninfo = NConnInfo,
conn_state = connected conn_state = connected
@ -1422,7 +1422,7 @@ parse_topic_filters(TopicFilters) ->
ensure_disconnected(Reason, Channel = #channel{conninfo = ConnInfo, ensure_disconnected(Reason, Channel = #channel{conninfo = ConnInfo,
clientinfo = ClientInfo}) -> clientinfo = ClientInfo}) ->
NConnInfo = ConnInfo#{disconnected_at => erlang:system_time(second)}, NConnInfo = ConnInfo#{disconnected_at => erlang:system_time(millisecond)},
ok = run_hooks('client.disconnected', [ClientInfo, Reason, NConnInfo]), ok = run_hooks('client.disconnected', [ClientInfo, Reason, NConnInfo]),
Channel#channel{conninfo = NConnInfo, conn_state = disconnected}. Channel#channel{conninfo = NConnInfo, conn_state = disconnected}.

2
src/emqx_session.erl
View File

@ -168,7 +168,7 @@ init(#{zone := Zone}, #{receive_maximum := MaxInflight}) ->
awaiting_rel = #{}, awaiting_rel = #{},
max_awaiting_rel = get_env(Zone, max_awaiting_rel, 100), max_awaiting_rel = get_env(Zone, max_awaiting_rel, 100),
await_rel_timeout = timer:seconds(get_env(Zone, await_rel_timeout, 300)), await_rel_timeout = timer:seconds(get_env(Zone, await_rel_timeout, 300)),
created_at = erlang:system_time(second) created_at = erlang:system_time(millisecond)
}. }.
%% @private init mq %% @private init mq