summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2015-07-30 17:52:44 +0200
committerJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2015-08-05 16:16:38 +0200
commit584af327acd8e74b54d3701778aa5167cc55b6ed (patch)
tree3625c84b4dd2b5d99dfb3233ef6026651c8ef671
parentd718d4c5af58418cad3b6e8d7747efef66d5f801 (diff)
downloadrabbitmq-server-git-584af327acd8e74b54d3701778aa5167cc55b6ed.tar.gz
Use os:timestamp() to get a non-unique timestamp
References #233.
-rw-r--r--src/rabbit_amqqueue_process.erl2
-rw-r--r--src/rabbit_channel.erl2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index c5e4206fe3..2cc4c0543b 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -1306,7 +1306,7 @@ handle_pre_hibernate(State = #q{backing_queue = BQ,
BQS3 = BQ:handle_pre_hibernate(BQS2),
rabbit_event:if_enabled(
State, #q.stats_timer,
- fun () -> emit_stats(State, [{idle_since, now()},
+ fun () -> emit_stats(State, [{idle_since, os:timestamp()},
{consumer_utilisation, ''}]) end),
State1 = rabbit_event:stop_stats_timer(State#q{backing_queue_state = BQS3},
#q.stats_timer),
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index f7383c87cd..d51a8f04c4 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -578,7 +578,7 @@ handle_pre_hibernate(State) ->
ok = clear_permission_cache(),
rabbit_event:if_enabled(
State, #ch.stats_timer,
- fun () -> emit_stats(State, [{idle_since, now()}]) end),
+ fun () -> emit_stats(State, [{idle_since, os:timestamp()}]) end),
{hibernate, rabbit_event:stop_stats_timer(State, #ch.stats_timer)}.
terminate(Reason, State) ->