diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-03-04 17:16:32 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-03-04 17:16:32 +0000 |
| commit | 1d858806f81e5ae82b4ec9093135a59f7276864b (patch) | |
| tree | 3fef86bedc2277ec9fd786f7a5d2cd3a37076718 /src | |
| parent | 420c7326140f9a1bc38624e0403e6f8d63eb6b92 (diff) | |
| download | rabbitmq-server-git-1d858806f81e5ae82b4ec9093135a59f7276864b.tar.gz | |
compromise renaming
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_channel.erl | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index fe6522fe6d..77960e458b 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -298,8 +298,10 @@ handle_info({'DOWN', MRef, process, QPid, Reason}, State = #ch{consumer_monitors = ConsumerMonitors}) -> noreply( case dict:find(MRef, ConsumerMonitors) of - error -> handle_queue_down(QPid, Reason, State); - {ok, ConsumerTag} -> handle_consumer_down(MRef, ConsumerTag, State) + error -> + handle_publishing_queue_down(QPid, Reason, State); + {ok, ConsumerTag} -> + handle_consuming_queue_down(MRef, ConsumerTag, State) end). handle_pre_hibernate(State = #ch{stats_timer = StatsTimer}) -> @@ -1103,7 +1105,7 @@ monitor_consumer(ConsumerTag, State = #ch{consumer_mapping = ConsumerMapping, State end. -handle_queue_down(QPid, Reason, State = #ch{unconfirmed_qm = UQM}) -> +handle_publishing_queue_down(QPid, Reason, State = #ch{unconfirmed_qm = UQM}) -> MsgSeqNos = case gb_trees:lookup(QPid, UQM) of {value, MsgSet} -> gb_sets:to_list(MsgSet); none -> [] @@ -1120,10 +1122,10 @@ handle_queue_down(QPid, Reason, State = #ch{unconfirmed_qm = UQM}) -> end)(MXs, State2), queue_blocked(QPid, State3). -handle_consumer_down(MRef, ConsumerTag, - State = #ch{consumer_mapping = ConsumerMapping, - consumer_monitors = ConsumerMonitors, - writer_pid = WriterPid}) -> +handle_consuming_queue_down(MRef, ConsumerTag, + State = #ch{consumer_mapping = ConsumerMapping, + consumer_monitors = ConsumerMonitors, + writer_pid = WriterPid}) -> ConsumerMapping1 = dict:erase(ConsumerTag, ConsumerMapping), ConsumerMonitors1 = dict:erase(MRef, ConsumerMonitors), Cancel = #'basic.cancel'{consumer_tag = ConsumerTag, |