diff options
| author | Tim Watson <tim@rabbitmq.com> | 2013-06-04 12:23:14 +0100 |
|---|---|---|
| committer | Tim Watson <tim@rabbitmq.com> | 2013-06-04 12:23:14 +0100 |
| commit | ad70c448410dd02df6a357374a2977cebcbda706 (patch) | |
| tree | 30a56897131b4bb591bb50c408d1f72b3a5dc17b | |
| parent | 38380258b363e7e345c997302fb9fd08d953be63 (diff) | |
| download | rabbitmq-server-git-ad70c448410dd02df6a357374a2977cebcbda706.tar.gz | |
Remove expiration property from dead lettered messages
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index d2f4a178d5..f7d143819e 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -912,9 +912,13 @@ make_dead_letter_msg(Msg = #basic_message{content = Content, HeadersFun1(rabbit_basic:prepend_table_header(<<"x-death">>, Info, Headers)) end, - Content1 = rabbit_basic:map_headers(HeadersFun2, Content), + Content1 = #content{properties = Props} = + rabbit_basic:map_headers(HeadersFun2, Content), + PropsNoExpiration = Props#'P_basic'{expiration = undefined}, + ContentNoExpiration = Content1#content{properties = PropsNoExpiration}, Msg#basic_message{exchange_name = DLX, id = rabbit_guid:gen(), - routing_keys = DeathRoutingKeys, content = Content1}. + routing_keys = DeathRoutingKeys, + content = ContentNoExpiration}. now_micros() -> timer:now_diff(now(), {0,0,0}). |