diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_misc.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_reader.erl | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl index 6f353da574..286d8bbc58 100644 --- a/src/rabbit_misc.erl +++ b/src/rabbit_misc.erl @@ -71,6 +71,7 @@ -export([get_parent/0]). -export([store_proc_name/1, store_proc_name/2]). -export([moving_average/4]). +-export([timestamp/1]). %% Horrible macro to use in guards -define(IS_BENIGN_EXIT(R), @@ -1016,6 +1017,9 @@ term_to_json(V) when is_binary(V) orelse is_number(V) orelse V =:= null orelse V =:= true orelse V =:= false -> V. +timestamp({Mega, Sec, Micro}) -> + (Mega * 1000000 * 1000000 + Sec * 1000000 + Micro) div 1000. + check_expiry(N) when N < 0 -> {error, {value_negative, N}}; check_expiry(_N) -> ok. diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 7c03289327..ba62c7a473 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -238,7 +238,7 @@ start_connection(Parent, HelperSup, Deb, Sock, SockTransform) -> capabilities = [], auth_mechanism = none, auth_state = none, - connected_at = timestamp(os:timestamp())}, + connected_at = rabbit_misc:timestamp(os:timestamp())}, callback = uninitialized_callback, recv_len = 0, pending_recv = false, @@ -1173,10 +1173,6 @@ emit_stats(State) -> _ -> State1 end. -timestamp({Mega, Sec, Micro}) -> - (Mega * 1000000 * 1000000 + Sec * 1000000 + Micro) div 1000. - - %% 1.0 stub -ifdef(use_specs). -spec(become_1_0/2 :: (non_neg_integer(), #v1{}) -> no_return()). |