diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-02-17 18:44:20 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-02-17 18:44:20 +0000 |
| commit | e0d87da8e30ab3a8d99b908bad5916fdb86b2ee2 (patch) | |
| tree | e769edd416ed24a2d3a905079fbcbab416719fea /src | |
| parent | 5534d8c648a8083f5faeb43f58d4ab6fa6ccc2e3 (diff) | |
| download | rabbitmq-server-git-e0d87da8e30ab3a8d99b908bad5916fdb86b2ee2.tar.gz | |
Show state as 'flow' if we are currently flow blocked and have been so for more than 5s.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_exchange_type_direct.erl | 1 | ||||
| -rw-r--r-- | src/rabbit_reader.erl | 13 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/rabbit_exchange_type_direct.erl b/src/rabbit_exchange_type_direct.erl index 52704ab6c8..84511049d6 100644 --- a/src/rabbit_exchange_type_direct.erl +++ b/src/rabbit_exchange_type_direct.erl @@ -38,6 +38,7 @@ serialise_events() -> false. route(#exchange{name = Name}, #delivery{message = #basic_message{routing_keys = Routes}}) -> + timer:sleep(10000), rabbit_router:match_routing_key(Name, Routes). validate(_X) -> ok. diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 9ffcd20300..c65ba72156 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -1073,12 +1073,13 @@ i(peer_cert_subject, S) -> cert_info(fun rabbit_ssl:peer_cert_subject/1, S); i(peer_cert_validity, S) -> cert_info(fun rabbit_ssl:peer_cert_validity/1, S); i(channels, #v1{channel_count = ChannelCount}) -> ChannelCount; 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, Recent} of - {flow, true} -> flow; - {_, _} -> ConnectionState + throttle = #throttle{last_blocked_by = WasBlockedBy, + last_blocked_at = T}}) -> + Recently = T =/= never andalso timer:now_diff(erlang:now(), T) < 5000000, + case {credit_flow:blocked(), WasBlockedBy, Recently} of + {true, _, _} -> flow; + {false, flow, true} -> flow; + {_, _, _} -> ConnectionState end; i(Item, #v1{connection = Conn}) -> ic(Item, Conn). |