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 | a36ab07e92eb61af12fefea45f1eff8328654116 (patch) | |
| tree | ca33c1f0bc99dde4828d35d42d27acec9b3b2595 /src | |
| parent | b9561f4c97a7504beb3e940238077df5a1223e11 (diff) | |
| parent | 43a62fc9e99894da8bef56e2e3ba536989edf88b (diff) | |
| download | rabbitmq-server-git-a36ab07e92eb61af12fefea45f1eff8328654116.tar.gz | |
Merge bug25295
Diffstat (limited to 'src')
| -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 9dbfbdea71..2afc4c3641 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 |