diff options
| author | Rob Harrop <rob@rabbitmq.com> | 2011-03-23 15:34:23 +0000 |
|---|---|---|
| committer | Rob Harrop <rob@rabbitmq.com> | 2011-03-23 15:34:23 +0000 |
| commit | 335cbed6f5a5d4342511ebdfe1033f5bec237e1d (patch) | |
| tree | 1bae8bac68cb832a76b088e1b475d091eb29ec53 | |
| parent | 70909e0d2e0cec7decfadf569b4fa7d85642b693 (diff) | |
| download | rabbitmq-server-git-335cbed6f5a5d4342511ebdfe1033f5bec237e1d.tar.gz | |
Switched to now_ms()
| -rw-r--r-- | src/rabbit_error_logger.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_misc.erl | 8 |
2 files changed, 3 insertions, 8 deletions
diff --git a/src/rabbit_error_logger.erl b/src/rabbit_error_logger.erl index 33dfcef9a4..5f53e430b1 100644 --- a/src/rabbit_error_logger.erl +++ b/src/rabbit_error_logger.erl @@ -70,6 +70,7 @@ publish1(RoutingKey, Format, Data, LogExch) -> {ok, _RoutingRes, _DeliveredQPids} = rabbit_basic:publish(LogExch, RoutingKey, false, false, none, #'P_basic'{content_type = <<"text/plain">>, - timestamp = rabbit_misc:timestamp()}, + timestamp = + rabbit_misc:now_ms() div 1000}, list_to_binary(io_lib:format(Format, Data))), ok. diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl index 713498c82c..e79a58a1b6 100644 --- a/src/rabbit_misc.erl +++ b/src/rabbit_misc.erl @@ -52,7 +52,7 @@ unlink_and_capture_exit/1]). -export([get_options/2]). -export([all_module_attributes/1, build_acyclic_graph/3]). --export([now_ms/0, timestamp/0]). +-export([now_ms/0]). -export([lock_file/1]). -export([const_ok/1, const/1]). -export([ntoa/1, ntoab/1]). @@ -190,7 +190,6 @@ {bad_edge, [digraph:vertex()]}), digraph:vertex(), digraph:vertex()})). -spec(now_ms/0 :: () -> non_neg_integer()). --spec(timestamp/0 ::() -> non_neg_integer()). -spec(lock_file/1 :: (file:filename()) -> rabbit_types:ok_or_error('eexist')). -spec(const_ok/1 :: (any()) -> 'ok'). -spec(const/1 :: (A) -> const(A)). @@ -200,7 +199,6 @@ -endif. --define(EPOCH, {{1970, 1, 1}, {0, 0, 0}}). %%---------------------------------------------------------------------------- method_record_type(Record) -> @@ -793,10 +791,6 @@ get_flag(_, []) -> now_ms() -> timer:now_diff(now(), {0,0,0}) div 1000. -timestamp() -> - calendar:datetime_to_gregorian_seconds(erlang:universaltime()) - - calendar:datetime_to_gregorian_seconds(?EPOCH). - module_attributes(Module) -> case catch Module:module_info(attributes) of {'EXIT', {undef, [{Module, module_info, _} | _]}} -> |