summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2012-08-13 15:13:48 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2012-08-13 15:13:48 +0100
commit92dca43d2e4159b6a90116721eec80950207cc25 (patch)
treea8c76b861df87e29380b11a1ddbde07e9e401c78
parentebdb4847e0ddde94e4ec5c649cb8e8d6a81b06f3 (diff)
downloadrabbitmq-server-bug25097.tar.gz
don't re-schedule timer when the new timer would go off <1ms soonerbug25097
...since timer granularity is 1ms
-rw-r--r--src/rabbit_amqqueue_process.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index 283eba7c..66c90079 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -748,7 +748,7 @@ ensure_ttl_timer(Expiry, State = #q{ttl_timer_ref = undefined}) ->
State#q{ttl_timer_ref = TRef, ttl_timer_expiry = Expiry};
ensure_ttl_timer(Expiry, State = #q{ttl_timer_ref = TRef,
ttl_timer_expiry = TExpiry})
- when Expiry < TExpiry ->
+ when Expiry + 1000 < TExpiry ->
case erlang:cancel_timer(TRef) of
false -> State;
_ -> ensure_ttl_timer(Expiry, State#q{ttl_timer_ref = undefined})