summaryrefslogtreecommitdiff
path: root/src/rabbit_vhost.erl
diff options
context:
space:
mode:
authorEmile Joubert <emile@rabbitmq.com>2012-10-15 17:46:25 +0100
committerEmile Joubert <emile@rabbitmq.com>2012-10-15 17:46:25 +0100
commit3c0d32a5a3fc9c53301cbc21d2e8a40c5ca2a9a3 (patch)
treea719f9470be16593bfb16907bf628fbb41fc7603 /src/rabbit_vhost.erl
parent5c9503287fa53f03e81e187dcfb01dc98a83dd99 (diff)
downloadrabbitmq-server-3c0d32a5a3fc9c53301cbc21d2e8a40c5ca2a9a3.tar.gz
Rename and refactor policies
Diffstat (limited to 'src/rabbit_vhost.erl')
-rw-r--r--src/rabbit_vhost.erl13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/rabbit_vhost.erl b/src/rabbit_vhost.erl
index 9beedc51..68b04cb1 100644
--- a/src/rabbit_vhost.erl
+++ b/src/rabbit_vhost.erl
@@ -93,15 +93,14 @@ internal_delete(VHostPath) ->
[ok = rabbit_auth_backend_internal:clear_permissions(
proplists:get_value(user, Info), VHostPath)
|| Info <- rabbit_auth_backend_internal:list_vhost_permissions(VHostPath)],
- [ok = rabbit_runtime_parameters:clear_param(
+ [ok = rabbit_runtime_parameters:clear(VHostPath,
+ proplists:get_value(component, Info),
+ proplists:get_value(key, Info))
+ || Info <- rabbit_runtime_parameters:list(VHostPath)],
+ [ok = rabbit_policy:delete(
VHostPath,
- proplists:get_value(component, Info),
proplists:get_value(key, Info))
- || Info <- rabbit_runtime_parameters:list_param(VHostPath)],
- [ok = rabbit_runtime_parameters:clear_policy(
- VHostPath,
- proplists:get_value(key, Info))
- || Info <- rabbit_runtime_parameters:list_policies(VHostPath)],
+ || Info <- rabbit_policy:list(VHostPath)],
ok = mnesia:delete({rabbit_vhost, VHostPath}),
ok.