diff options
| -rw-r--r-- | src/mod_pubsub.erl | 6 | ||||
| -rw-r--r-- | src/node_flat.erl | 2 | ||||
| -rw-r--r-- | src/node_flat_odbc.erl | 4 | ||||
| -rw-r--r-- | src/pubsub_migrate.erl | 2 | ||||
| -rw-r--r-- | src/pubsub_subscription.erl | 2 | ||||
| -rw-r--r-- | src/pubsub_subscription_odbc.erl | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/src/mod_pubsub.erl b/src/mod_pubsub.erl index 089386a89..a429eb4e0 100644 --- a/src/mod_pubsub.erl +++ b/src/mod_pubsub.erl @@ -3141,7 +3141,7 @@ sub_option_can_deliver(nodes, _, {subscription_type, items}) -> false; sub_option_can_deliver(_, _, {subscription_depth, all}) -> true; sub_option_can_deliver(_, Depth, {subscription_depth, D}) -> Depth =< D; sub_option_can_deliver(_, _, {deliver, false}) -> false; -sub_option_can_deliver(_, _, {expire, When}) -> now() < When; +sub_option_can_deliver(_, _, {expire, When}) -> p1_time_compat:timestamp() < When; sub_option_can_deliver(_, _, _) -> true. -spec(presence_can_deliver/2 :: @@ -3910,7 +3910,7 @@ set_cached_item({_, ServerHost, _}, Nidx, ItemId, Publisher, Payload) -> set_cached_item(Host, Nidx, ItemId, Publisher, Payload) -> case is_last_item_cache_enabled(Host) of true -> mnesia:dirty_write({pubsub_last_item, Nidx, ItemId, - {now(), jid:tolower(jid:remove_resource(Publisher))}, + {p1_time_compat:timestamp(), jid:tolower(jid:remove_resource(Publisher))}, Payload}); _ -> ok end. @@ -4218,7 +4218,7 @@ string_to_ljid(JID) -> -spec(uniqid/0 :: () -> mod_pubsub:itemId()). uniqid() -> - {T1, T2, T3} = now(), + {T1, T2, T3} = p1_time_compat:timestamp(), iolist_to_binary(io_lib:fwrite("~.16B~.16B~.16B", [T1, T2, T3])). nodeAttr(Node) -> [{<<"node">>, Node}]. diff --git a/src/node_flat.erl b/src/node_flat.erl index a003642f8..d73b2be0c 100644 --- a/src/node_flat.erl +++ b/src/node_flat.erl @@ -362,7 +362,7 @@ publish_item(Nidx, Publisher, PublishModel, MaxItems, ItemId, Payload) -> {error, ?ERR_FORBIDDEN}; true -> if MaxItems > 0 -> - Now = now(), + Now = p1_time_compat:timestamp(), PubId = {Now, SubKey}, Item = case get_item(Nidx, ItemId) of {result, OldItem} -> diff --git a/src/node_flat_odbc.erl b/src/node_flat_odbc.erl index 37e3282a9..b8af0da0b 100644 --- a/src/node_flat_odbc.erl +++ b/src/node_flat_odbc.erl @@ -223,9 +223,9 @@ publish_item(Nidx, Publisher, PublishModel, MaxItems, ItemId, Payload) -> {error, ?ERR_FORBIDDEN}; true -> if MaxItems > 0 -> - PubId = {now(), SubKey}, + PubId = {p1_time_compat:timestamp(), SubKey}, set_item(#pubsub_item{itemid = {ItemId, Nidx}, - creation = {now(), GenKey}, + creation = {p1_time_compat:timestamp(), GenKey}, modification = PubId, payload = Payload}), Items = [ItemId | itemids(Nidx, GenKey) -- [ItemId]], diff --git a/src/pubsub_migrate.erl b/src/pubsub_migrate.erl index 35282d973..7ac54ffec 100644 --- a/src/pubsub_migrate.erl +++ b/src/pubsub_migrate.erl @@ -157,7 +157,7 @@ update_node_database(Host, ServerHost) -> {unknown, Publisher}, M = - {now(), + {p1_time_compat:timestamp(), Publisher}, mnesia:write(#pubsub_item{itemid = diff --git a/src/pubsub_subscription.erl b/src/pubsub_subscription.erl index df1560005..51bd9a0ff 100644 --- a/src/pubsub_subscription.erl +++ b/src/pubsub_subscription.erl @@ -202,7 +202,7 @@ write_subscription(_JID, _NodeId, SubID, Options) -> -spec(make_subid/0 :: () -> SubId::mod_pubsub:subId()). make_subid() -> - {T1, T2, T3} = now(), + {T1, T2, T3} = p1_time_compat:timestamp(), iolist_to_binary(io_lib:fwrite("~.16B~.16B~.16B", [T1, T2, T3])). %% diff --git a/src/pubsub_subscription_odbc.erl b/src/pubsub_subscription_odbc.erl index 6c99b155d..382ac006a 100644 --- a/src/pubsub_subscription_odbc.erl +++ b/src/pubsub_subscription_odbc.erl @@ -165,7 +165,7 @@ create_table() -> ok. -spec(make_subid/0 :: () -> mod_pubsub:subId()). make_subid() -> - {T1, T2, T3} = now(), + {T1, T2, T3} = p1_time_compat:timestamp(), iolist_to_binary(io_lib:fwrite("~.16B~.16B~.16B", [T1, T2, T3])). %% |