summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Watson <tim@rabbitmq.com>2013-06-06 15:07:03 +0100
committerTim Watson <tim@rabbitmq.com>2013-06-06 15:07:03 +0100
commit3567b5db0906f727a269460ac2ba64128fd2e269 (patch)
treed2077b84dd5c1f25e18902c1f4a3defb262a9810
parentf9094e19b9fe49b4b2fd22da366460627b1585b6 (diff)
downloadrabbitmq-server-3567b5db0906f727a269460ac2ba64128fd2e269.tar.gz
allows log the per-msg-ttl if it is present
-rw-r--r--src/rabbit_amqqueue_process.erl5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index d973e9ea..d3e88e8b 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -898,10 +898,7 @@ make_dead_letter_msg(Msg = #basic_message{content = Content,
end,
ReasonBin = list_to_binary(atom_to_list(Reason)),
TimeSec = rabbit_misc:now_ms() div 1000,
- PerMsgTTL = case Reason of
- expired -> per_msg_ttl_header(Content#content.properties);
- _ -> []
- end,
+ PerMsgTTL = per_msg_ttl_header(Content#content.properties),
HeadersFun2 =
fun (Headers) ->
%% The first routing key is the one specified in the