diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_amqqueue.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_reader.erl | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index 8306f13461..6b1e00b7c9 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -115,7 +115,8 @@ -spec(notify_policy_changed/1 :: (rabbit_types:amqqueue()) -> 'ok'). -spec(consumers/1 :: (rabbit_types:amqqueue()) - -> [{pid(), rabbit_types:ctag(), boolean()}]). + -> [{pid(), rabbit_types:ctag(), boolean(), + rabbit_framing:amqp_table()}]). -spec(consumer_info_keys/0 :: () -> rabbit_types:info_keys()). -spec(consumers_all/1 :: (rabbit_types:vhost()) diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl index 48f65985c5..da22e09266 100644 --- a/src/rabbit_reader.erl +++ b/src/rabbit_reader.erl @@ -1045,11 +1045,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). |