summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniil Fedotov <dfedotov@pivotal.io>2017-01-17 13:02:42 +0000
committerDaniil Fedotov <dfedotov@pivotal.io>2017-01-17 13:02:42 +0000
commit24862a63d24dde583e697ae781fb1f4ba534d222 (patch)
treeec089c512cdbe79df23f4ca29b3c9d723245ae7f /src
parentdd92f155047a9f2d0c312287ef3711a2e5c7525f (diff)
downloadrabbitmq-server-git-24862a63d24dde583e697ae781fb1f4ba534d222.tar.gz
Fix API for listing vhost limits
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_vhost_limit.erl15
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.