summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2012-11-07 14:54:33 +0000
committerSimon MacMullen <simon@rabbitmq.com>2012-11-07 14:54:33 +0000
commita8cb4048fafb489cccd57a96f6668837d8d9098e (patch)
treef8a1f76a033fde2e56c1c7e798b955d9a6143713
parent1a4262f574568e17a8702ff6772a7ca8eed8c2d6 (diff)
downloadrabbitmq-server-a8cb4048fafb489cccd57a96f6668837d8d9098e.tar.gz
Apply TTL after DLX, during recovery we want to have a working DLX when messages are expired.
-rw-r--r--src/rabbit_amqqueue_process.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index 43fe3578..fb457478 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -247,9 +247,9 @@ process_args(State = #q{q = #amqqueue{arguments = Arguments}}) ->
end
end, State,
[{<<"x-expires">>, fun init_expires/2},
- {<<"x-message-ttl">>, fun init_ttl/2},
{<<"x-dead-letter-exchange">>, fun init_dlx/2},
- {<<"x-dead-letter-routing-key">>, fun init_dlx_routing_key/2}]).
+ {<<"x-dead-letter-routing-key">>, fun init_dlx_routing_key/2},
+ {<<"x-message-ttl">>, fun init_ttl/2}]).
init_expires(Expires, State) -> ensure_expiry_timer(State#q{expires = Expires}).