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

os:timestamp

This commit is contained in:
Feng Lee 2016-08-18 10:25:20 +08:00
parent f2f5f251d7
commit 6beb6bbbe4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/emqttd_message.erl
View File

@ -42,7 +42,7 @@ make(From, Qos, Topic, Payload) ->
qos = ?QOS_I(Qos), qos = ?QOS_I(Qos),
topic = Topic, topic = Topic,
payload = Payload, payload = Payload,
timestamp = os:timestamp()}. timestamp = emqttd_time:now_to_secs()}.
%% @doc Message from Packet %% @doc Message from Packet
-spec(from_packet(mqtt_packet()) -> mqtt_message()). -spec(from_packet(mqtt_packet()) -> mqtt_message()).
@ -60,7 +60,7 @@ from_packet(#mqtt_packet{header = #mqtt_packet_header{type = ?PUBLISH,
dup = Dup, dup = Dup,
topic = Topic, topic = Topic,
payload = Payload, payload = Payload,
timestamp = os:timestamp()}; timestamp = emqttd_time:now_to_secs()};
from_packet(#mqtt_packet_connect{will_flag = false}) -> from_packet(#mqtt_packet_connect{will_flag = false}) ->
undefined; undefined;
@ -78,7 +78,7 @@ from_packet(#mqtt_packet_connect{client_id = ClientId,
qos = Qos, qos = Qos,
dup = false, dup = false,
payload = Msg, payload = Msg,
timestamp = os:timestamp()}. timestamp = emqttd_time:now_to_secs()}.
from_packet(ClientId, Packet) -> from_packet(ClientId, Packet) ->
Msg = from_packet(Packet), Msg = from_packet(Packet),

4
src/emqttd_retainer.erl
View File

@ -192,8 +192,8 @@ expire_messages(Time) when is_integer(Time) ->
mnesia:transaction( mnesia:transaction(
fun() -> fun() ->
Match = ets:fun2ms( Match = ets:fun2ms(
fun(#retained_message{topic = Topic, msg = #mqtt_message{timestamp = {MegaSecs, Secs, _}}}) fun(#retained_message{topic = Topic, msg = #mqtt_message{timestamp = Ts}})
when Time > (MegaSecs * 1000000 + Secs) -> Topic when Time > Ts -> Topic
end), end),
Topics = mnesia:select(retained_message, Match, write), Topics = mnesia:select(retained_message, Match, write),
lists:foreach(fun(<<"$SYS/", _/binary>>) -> ok; %% ignore $SYS/# messages lists:foreach(fun(<<"$SYS/", _/binary>>) -> ok; %% ignore $SYS/# messages