]> granicus.if.org Git - ejabberd/commitdiff
Remove now() calls that sneaked in in pull requests
authorPaweł Chmielowski <pchmielowski@process-one.net>
Tue, 26 Feb 2019 17:48:46 +0000 (18:48 +0100)
committerPaweł Chmielowski <pchmielowski@process-one.net>
Wed, 27 Feb 2019 08:56:31 +0000 (09:56 +0100)
include/mod_muc_room.hrl
src/mod_muc_admin.erl
src/mod_muc_room.erl

index 40b1b9c046fe6ee3cf47f165d07eb89ac3c76cf8..9111128c07eeef886ffa0c8d544f0a1646dd9547 100644 (file)
     history                 :: lqueue(),
     subject                 = [] :: [text()],
     subject_author          = <<"">> :: binary(),
-    just_created            = misc:now_to_usec(now()) :: true | integer(),
+    just_created            = p1_time_compat:os_system_time(micro_seconds) :: true | integer(),
     activity                = treap:empty() :: treap:treap(),
     room_shaper             = none :: shaper:shaper(),
     room_queue              :: p1_queue:queue() | undefined
index f75e24b7de4f3a94f2dd16ab8407762b69c8ea5e..b3840bc4831f226f2c3f1e858eadc30b0d0a1d06 100644 (file)
@@ -819,7 +819,7 @@ decide_room(unused, {_Room_name, _Host, Room_pid}, ServerHost, Last_allowed) ->
                           true when (HistorySize == 0) or (JustCreated == true) ->
                               {false, 0};
                           true ->
-                              Ts_diff = (misc:now_to_usec(now())
+                              Ts_diff = (p1_time_compat:os_system_time(micro_seconds)
                                    - S#state.just_created) div 1000000,
                               {false, Ts_diff};
                           false ->
index a8818aca405be22b3bda2f2fd2394fcc9b7df40b..ec1222855228ca35c462592092a66398f6b87e91 100644 (file)
@@ -1960,7 +1960,7 @@ add_new_user(From, Nick, Packet, StateData) ->
                  ResultState =
                      case NewStateData#state.just_created of
                          true ->
-                             NewStateData#state{just_created = misc:now_to_usec(now())};
+                             NewStateData#state{just_created = p1_time_compat:os_system_time(micro_seconds)};
                          _ ->
                              Robots = maps:remove(From, StateData#state.robots),
                              NewStateData#state{robots = Robots}