diff options
| author | Michael Klishin <michael@novemberain.com> | 2017-01-17 18:41:58 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-17 18:41:58 +0300 |
| commit | bfff36ea6517bcb478534001a0430f5e58149666 (patch) | |
| tree | ec089c512cdbe79df23f4ca29b3c9d723245ae7f /src | |
| parent | dd92f155047a9f2d0c312287ef3711a2e5c7525f (diff) | |
| parent | 24862a63d24dde583e697ae781fb1f4ba534d222 (diff) | |
| download | rabbitmq-server-git-bfff36ea6517bcb478534001a0430f5e58149666.tar.gz | |
Merge pull request #1083 from rabbitmq/rabbitmq-cli-165
Fix API for listing vhost limits
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 d6354f2f05..b79ca63642 100644 --- a/src/rabbit_vhost_limit.erl +++ b/src/rabbit_vhost_limit.erl @@ -60,7 +60,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)} @@ -71,14 +71,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. |