diff options
| author | Tim Watson <tim@rabbitmq.com> | 2012-10-31 11:42:48 +0000 |
|---|---|---|
| committer | Tim Watson <tim@rabbitmq.com> | 2012-10-31 11:42:48 +0000 |
| commit | c791885aaa816f35a2c77079cd96486a84aaf181 (patch) | |
| tree | cc5ddb2372bc464d94a6a28ab58a1f74d881dddb | |
| parent | 97213c7634ffe082b8796d6ae3f17b532e6292a4 (diff) | |
| download | rabbitmq-server-git-c791885aaa816f35a2c77079cd96486a84aaf181.tar.gz | |
messages can always 'potentially' expire
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index c3d717fb16..2cf3e9f125 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -719,8 +719,6 @@ calculate_msg_expiry(#basic_message{content = Content}, TTL) -> T -> now_micros() + T * 1000 end. -drop_expired_messages(State = #q{ttl = undefined}) -> - State; drop_expired_messages(State = #q{backing_queue_state = BQS, backing_queue = BQ }) -> Now = now_micros(), @@ -743,8 +741,6 @@ drop_expired_messages(State = #q{backing_queue_state = BQS, ensure_ttl_timer(undefined, State) -> State; -ensure_ttl_timer(_Expiry, State = #q{ttl = undefined}) -> - State; ensure_ttl_timer(Expiry, State = #q{ttl_timer_ref = undefined}) -> After = (case Expiry - now_micros() of V when V > 0 -> V + 999; %% always fire later |