diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2013-12-12 17:40:54 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2013-12-12 17:40:54 +0000 |
| commit | 80bab399342bd8c00f5ea0c7047890c873b868fe (patch) | |
| tree | a733705a4555969173fa8b1d2f94427cd0363480 | |
| parent | c6579be6fd71de1db80511e95a9ec80a0a721183 (diff) | |
| parent | ba77d893a77e7e9311d62b7f17c28eb42f3a8c13 (diff) | |
| download | rabbitmq-server-git-80bab399342bd8c00f5ea0c7047890c873b868fe.tar.gz | |
Merge bug22525
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 3 | ||||
| -rw-r--r-- | packaging/debs/Debian/debian/changelog | 6 | ||||
| -rw-r--r-- | src/rabbit_amqqueue.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_reader.erl | 8 |
4 files changed, 14 insertions, 6 deletions
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index 05140e3c78..f53eea9571 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -130,6 +130,9 @@ done rm -rf %{buildroot} %changelog +* Tue Dec 10 2013 emile@rabbitmq.com 3.2.2-1 +- New Upstream Release + * Wed Oct 23 2013 emile@rabbitmq.com 3.2.0-1 - New Upstream Release diff --git a/packaging/debs/Debian/debian/changelog b/packaging/debs/Debian/debian/changelog index 6c63478fa2..f1e1c66b20 100644 --- a/packaging/debs/Debian/debian/changelog +++ b/packaging/debs/Debian/debian/changelog @@ -1,3 +1,9 @@ +rabbitmq-server (3.2.2-1) unstable; urgency=low + + * New Upstream Release + + -- Emile Joubert <emile@rabbitmq.com> Tue, 10 Dec 2013 16:08:08 +0000 + rabbitmq-server (3.2.0-1) unstable; urgency=low * New Upstream Release 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). |