diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2017-01-17 20:23:51 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2017-01-17 20:23:51 +0300 |
| commit | 6bf17f6c6351e019db3df4112d1c33b95bcff705 (patch) | |
| tree | e12fafa5f58d31d6e7ea4cc98b4d1c72fa8481dd /src | |
| parent | 7e3aae8c1af08775dd3094c17aadfd380a41e383 (diff) | |
| parent | bfff36ea6517bcb478534001a0430f5e58149666 (diff) | |
| download | rabbitmq-server-git-6bf17f6c6351e019db3df4112d1c33b95bcff705.tar.gz | |
Merge branch 'master' into rabbitmq-event-exchange-10
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_vhost_limit.erl | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/rabbit_vhost_limit.erl b/src/rabbit_vhost_limit.erl index c4bf78cb1c..b948a94668 100644 --- a/src/rabbit_vhost_limit.erl +++ b/src/rabbit_vhost_limit.erl @@ -63,7 +63,7 @@ queue_limit(VirtualHost) -> get_limit(VirtualHost, <<"max-queues">>). -list0(VHost) -> +query_limits(VHost) -> case rabbit_runtime_parameters:list(VHost, <<"vhost-limits">>) of [] -> []; Params -> [ {pget(vhost, Param), pget(value, Param)} @@ -74,14 +74,15 @@ list0(VHost) -> -spec list() -> [{rabbit_types:vhost(), rabbit_types:infos()}]. - -list() -> list0('_'). - +list() -> + query_limits('_'). -spec list(rabbit_types:vhost()) -> rabbit_types:infos(). - -list(VHost) -> list0(VHost). - +list(VHost) -> + case query_limits(VHost) of + [] -> []; + [{VHost, Value}] -> Value + end. -spec is_over_connection_limit(rabbit_types:vhost()) -> {true, non_neg_integer()} | false. |