From 6beb6bbbe44a7bfa6071ede42be5ea43f005b318 Mon Sep 17 00:00:00 2001
From: Feng Lee <ery.lee@gmail.com>
Date: Thu, 18 Aug 2016 10:25:20 +0800
Subject: [PATCH] os:timestamp

---
 src/emqttd_message.erl  | 6 +++---
 src/emqttd_retainer.erl | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/emqttd_message.erl b/src/emqttd_message.erl
index e798f0fd8..4784e6331 100644
--- a/src/emqttd_message.erl
+++ b/src/emqttd_message.erl
@@ -42,7 +42,7 @@ make(From, Qos, Topic, Payload) ->
                   qos       = ?QOS_I(Qos),
                   topic     = Topic,
                   payload   = Payload,
-                  timestamp = os:timestamp()}.
+                  timestamp = emqttd_time:now_to_secs()}.
 
 %% @doc Message from Packet
 -spec(from_packet(mqtt_packet()) -> mqtt_message()).
@@ -60,7 +60,7 @@ from_packet(#mqtt_packet{header   = #mqtt_packet_header{type   = ?PUBLISH,
                   dup       = Dup,
                   topic     = Topic,
                   payload   = Payload,
-                  timestamp = os:timestamp()};
+                  timestamp = emqttd_time:now_to_secs()};
 
 from_packet(#mqtt_packet_connect{will_flag  = false}) ->
     undefined;
@@ -78,7 +78,7 @@ from_packet(#mqtt_packet_connect{client_id   = ClientId,
                   qos       = Qos,
                   dup       = false,
                   payload   = Msg, 
-                  timestamp = os:timestamp()}.
+                  timestamp = emqttd_time:now_to_secs()}.
 
 from_packet(ClientId, Packet) ->
     Msg = from_packet(Packet),
diff --git a/src/emqttd_retainer.erl b/src/emqttd_retainer.erl
index 005489e58..bce688e56 100644
--- a/src/emqttd_retainer.erl
+++ b/src/emqttd_retainer.erl
@@ -192,8 +192,8 @@ expire_messages(Time) when is_integer(Time) ->
     mnesia:transaction(
         fun() ->
             Match = ets:fun2ms(
-                        fun(#retained_message{topic = Topic, msg = #mqtt_message{timestamp = {MegaSecs, Secs, _}}})
-                            when Time > (MegaSecs * 1000000 + Secs) -> Topic
+                        fun(#retained_message{topic = Topic, msg = #mqtt_message{timestamp = Ts}})
+                            when Time > Ts -> Topic
                         end),
             Topics = mnesia:select(retained_message, Match, write),
             lists:foreach(fun(<<"$SYS/", _/binary>>) -> ok; %% ignore $SYS/# messages