diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-11-16 10:28:22 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-11-16 10:28:22 +0000 |
| commit | 73a1d59cf80c86450108450d70b26169d06acc68 (patch) | |
| tree | ca33c1f0bc99dde4828d35d42d27acec9b3b2595 | |
| parent | de5e29ea4bf0ab0c14de26395f3501e7d9ce48b2 (diff) | |
| parent | f546b647743c8a1ffa311ac9a940992b550ee0d5 (diff) | |
| download | rabbitmq-server-73a1d59cf80c86450108450d70b26169d06acc68.tar.gz | |
Merge bug25295
| -rw-r--r-- | src/rabbit_channel.erl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 9dbfbdea..2afc4c36 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -1126,12 +1126,13 @@ consumer_monitor(ConsumerTag, State end. -monitor_delivering_queue(true, _QPid, State) -> - State; -monitor_delivering_queue(false, QPid, State = #ch{queue_monitors = QMons, +monitor_delivering_queue(NoAck, QPid, State = #ch{queue_monitors = QMons, delivering_queues = DQ}) -> State#ch{queue_monitors = pmon:monitor(QPid, QMons), - delivering_queues = sets:add_element(QPid, DQ)}. + delivering_queues = case NoAck of + true -> DQ; + false -> sets:add_element(QPid, DQ) + end}. handle_publishing_queue_down(QPid, Reason, State = #ch{unconfirmed = UC}) -> case rabbit_misc:is_abnormal_exit(Reason) of |