diff options
author | Matthias Radestock <matthias@rabbitmq.com> | 2014-02-18 13:30:23 +0000 |
---|---|---|
committer | Matthias Radestock <matthias@rabbitmq.com> | 2014-02-18 13:30:23 +0000 |
commit | fcee3e87e62f5c33fad955c0d1f8c616d4ea3cb5 (patch) | |
tree | ada42c4a96d3cdba2f981bf20e81d52383041bd3 | |
parent | fc83c704e3261cd94b98053590b54c064e0ddf05 (diff) | |
download | rabbitmq-server-fcee3e87e62f5c33fad955c0d1f8c616d4ea3cb5.tar.gz |
cosmetic
-rw-r--r-- | src/rabbit_reader.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 11621b12..316e63c2 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -1076,9 +1076,9 @@ i(state, #v1{connection_state = ConnectionState, throttle = #throttle{alarmed_by = Alarms, last_blocked_by = WasBlockedBy, last_blocked_at = T}}) -> - case Alarms =:= [] andalso %% not blocked by resource alarms - (credit_flow:blocked() %% blocked by flow now - orelse %% blocked by flow recently + case Alarms =:= [] andalso %% not throttled by resource alarms + (credit_flow:blocked() %% throttled by flow now + orelse %% throttled by flow recently (WasBlockedBy =:= flow andalso T =/= never andalso timer:now_diff(erlang:now(), T) < 5000000)) of true -> flow; |