ソースを参照

timer:seconds

Feng Lee 10 年 前
コミット
22170b6c6d
2 ファイル変更5 行追加5 行削除
  1. 2 2
      src/emqttd_keepalive.erl
  2. 3 3
      src/emqttd_session.erl

+ 2 - 2
src/emqttd_keepalive.erl

@@ -42,7 +42,7 @@
 %%------------------------------------------------------------------------------
 new({Transport, Socket}, TimeoutSec, TimeoutMsg) when TimeoutSec > 0 ->
     {ok, [{recv_oct, RecvOct}]} = Transport:getstat(Socket, [recv_oct]),
-	Ref = erlang:send_after(TimeoutSec*1000, self(), TimeoutMsg),
+	Ref = erlang:send_after(timer:seconds(TimeoutSec), self(), TimeoutMsg),
 	#keepalive {transport   = Transport,
                 socket      = Socket, 
                 recv_oct    = RecvOct, 
@@ -67,7 +67,7 @@ resume(KeepAlive = #keepalive {transport   = Transport,
         true ->
             %need?
             cancel(Ref),
-            NewRef = erlang:send_after(TimeoutSec*1000, self(), TimeoutMsg),
+            NewRef = erlang:send_after(timer:seconds(TimeoutSec), self(), TimeoutMsg),
             {resumed, KeepAlive#keepalive{recv_oct = NewRecvOct, timer_ref = NewRef}}
     end.
 

+ 3 - 3
src/emqttd_session.erl

@@ -664,8 +664,8 @@ next_packet_id(Session = #session{packet_id = 16#ffff}) ->
 next_packet_id(Session = #session{packet_id = Id}) ->
     Session#session{packet_id = Id + 1}.
 
-timer(Timeout, TimeoutMsg) ->
-    erlang:send_after(Timeout * 1000, self(), TimeoutMsg).
+timer(TimeoutSec, TimeoutMsg) ->
+    erlang:send_after(timer:seconds(TimeoutSec), self(), TimeoutMsg).
 
 cancel_timer(undefined) -> 
 	undefined;
@@ -679,7 +679,7 @@ start_collector(Session = #session{collect_interval = 0}) ->
     Session;
 
 start_collector(Session = #session{collect_interval = Interval}) ->
-    TRef = erlang:send_after(Interval * 1000, self(), collect_info),
+    TRef = erlang:send_after(timer:seconds(Interval), self(), collect_info),
     Session#session{collect_timer = TRef}.
 
 info(#session{clean_sess      = CleanSess,