summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <michael@rabbitmq.com>2014-02-19 20:28:20 +0400
committerMichael Klishin <michael@rabbitmq.com>2014-02-19 20:28:20 +0400
commit0e58ddec2019f7323f3e439c0f0ac5670e851980 (patch)
tree8689dca3601097112c66162e1874dac412745361
parent955846b58a8d9eafc2427792b6df969c8242f4d1 (diff)
downloadrabbitmq-server-0e58ddec2019f7323f3e439c0f0ac5670e851980.tar.gz
Send connection.unblocked when connection is no longer blocked or all alarms clear
-rw-r--r--src/rabbit_reader.erl5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index 11ee686e..7a67b70c 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -331,7 +331,10 @@ handle_other({conserve_resources, Source, Conserve},
Throttle1 = Throttle#throttle{alarmed_by = CR1},
State1 = control_throttle(State#v1{throttle = Throttle1}),
case {CS, State1#v1.connection_state, (CR =/= []), (CR1 =:= [])} of
- {blocked, running, true, true} ->
+ {blocked, running, _, _} ->
+ send_unblocked(State1),
+ ok;
+ {blocked, blocked, true, true} ->
send_unblocked(State1),
ok;
{_, _, _, _} ->