diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-06-27 13:37:16 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-06-27 13:37:16 +0100 |
| commit | 576f89c8f89f40e818956996788c871a022123e2 (patch) | |
| tree | 5cd302d29d6e89281a5582951f4f38a6c2ac6d07 | |
| parent | 6cae14f9775472c725664bb0f563031be0efa61f (diff) | |
| download | rabbitmq-server-bug26255.tar.gz | |
More descriptive name.bug26255
| -rw-r--r-- | src/rabbit_misc.erl | 6 | ||||
| -rw-r--r-- | src/rabbit_reader.erl | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl index 44ca70ef..91f8b91e 100644 --- a/src/rabbit_misc.erl +++ b/src/rabbit_misc.erl @@ -71,7 +71,7 @@ -export([get_parent/0]). -export([store_proc_name/1, store_proc_name/2]). -export([moving_average/4]). --export([timestamp/1]). +-export([now_to_ms/1]). %% Horrible macro to use in guards -define(IS_BENIGN_EXIT(R), @@ -255,7 +255,7 @@ -spec(store_proc_name/1 :: (rabbit_types:proc_type_and_name()) -> ok). -spec(moving_average/4 :: (float(), float(), float(), float() | 'undefined') -> float()). --spec(timestamp/1 :: ({non_neg_integer(), +-spec(now_to_ms/1 :: ({non_neg_integer(), non_neg_integer(), non_neg_integer()}) -> pos_integer()). -endif. @@ -1020,7 +1020,7 @@ 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}) -> +now_to_ms({Mega, Sec, Micro}) -> (Mega * 1000000 * 1000000 + Sec * 1000000 + Micro) div 1000. check_expiry(N) when N < 0 -> {error, {value_negative, N}}; diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index ba62c7a4..70a66bee 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 = rabbit_misc:timestamp(os:timestamp())}, + connected_at = rabbit_misc:now_to_ms(os:timestamp())}, callback = uninitialized_callback, recv_len = 0, pending_recv = false, |