Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/processone/ejabberd.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Chmielowski <pchmielowski@process-one.net>2015-12-07 18:08:57 +0300
committerPaweł Chmielowski <pchmielowski@process-one.net>2015-12-07 18:09:48 +0300
commit29db302808f94697689d3010b3b589f9a00333b9 (patch)
tree0c82aa6e6f99a6bb8c188ea9995eba38e095f5d5 /src/mod_mam.erl
parentb9f751e0997dede2ee1e61612117d52757ad208a (diff)
More now() replacements
Diffstat (limited to 'src/mod_mam.erl')
-rw-r--r--src/mod_mam.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mod_mam.erl b/src/mod_mam.erl
index 87ff8e5e1..c0756b6eb 100644
--- a/src/mod_mam.erl
+++ b/src/mod_mam.erl
@@ -45,7 +45,7 @@
-record(archive_msg,
{us = {<<"">>, <<"">>} :: {binary(), binary()} | '$2',
id = <<>> :: binary() | '_',
- timestamp = now() :: erlang:timestamp() | '_' | '$1',
+ timestamp = p1_time_compat:timestamp() :: erlang:timestamp() | '_' | '$1',
peer = {<<"">>, <<"">>, <<"">>} :: ljid() | '_' | '$3',
bare_peer = {<<"">>, <<"">>, <<"">>} :: ljid() | '_' | '$3',
packet = #xmlel{} :: xmlel() | '_',
@@ -450,7 +450,7 @@ store_muc(MUCState, Pkt, RoomJID, Peer, Nick) ->
store(Pkt, _, {LUser, LServer}, Type, Peer, Nick, _Dir, mnesia) ->
LPeer = {PUser, PServer, _} = jid:tolower(Peer),
- TS = now(),
+ TS = p1_time_compat:timestamp(),
ID = jlib:integer_to_binary(now_to_usec(TS)),
case mnesia:dirty_write(
#archive_msg{us = {LUser, LServer},
@@ -467,7 +467,7 @@ store(Pkt, _, {LUser, LServer}, Type, Peer, Nick, _Dir, mnesia) ->
Err
end;
store(Pkt, LServer, {LUser, LHost}, Type, Peer, Nick, _Dir, odbc) ->
- TSinteger = now_to_usec(now()),
+ TSinteger = p1_time_compat:system_time(micro_seconds),
ID = TS = jlib:integer_to_binary(TSinteger),
SUser = case Type of
chat -> LUser;