diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2013-12-12 16:35:51 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2013-12-12 16:35:51 +0000 |
| commit | fc54c63b1746f904f9a98aaf74ee6baa42cccdb3 (patch) | |
| tree | 0f68fde6dbb219dc08c425e525ffd058558c1a86 | |
| parent | f820e6649b6407bb6d2ec39eb1b260901e990b73 (diff) | |
| download | rabbitmq-server-git-fc54c63b1746f904f9a98aaf74ee6baa42cccdb3.tar.gz | |
Simplify
| -rw-r--r-- | src/rabbit_reader.erl | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 67effab0ea..2e045b2b5e 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -1046,11 +1046,9 @@ i(state, #v1{connection_state = ConnectionState, throttle = #throttle{last_blocked_by = BlockedBy, last_blocked_at = T}}) -> Recent = T =/= never andalso timer:now_diff(erlang:now(), T) < 5000000, - case {BlockedBy, ConnectionState, Recent} of - {resourse, blocked, _} -> blocked; - {_, blocking, _} -> blocking; - {flow, _, true} -> flow; - {_, _, _} -> ConnectionState + case {BlockedBy, Recent} of + {flow, true} -> flow; + {_, _} -> ConnectionState end; i(Item, #v1{connection = Conn}) -> ic(Item, Conn). |