root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Naming: catch_no_user_vhost => catch_no_such_user_or_vhost

This commit is contained in:
Michael Klishin 2019-04-05 15:37:07 +04:00
parent 915af29bbb
commit e238ffdabe
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deps/rabbitmq_management/src/rabbit_mgmt_util.erl vendored
View File

@ -49,7 +49,7 @@
-export([direct_request/6]). -export([direct_request/6]).
-export([qs_val/2]). -export([qs_val/2]).
-export([get_path_prefix/0]). -export([get_path_prefix/0]).
-export([catch_no_user_vhost/2]). -export([catch_no_such_user_or_vhost/2]).
-import(rabbit_misc, [pget/2]). -import(rabbit_misc, [pget/2]).
@ -1090,8 +1090,8 @@ qs_val(Name, ReqData) ->
Qs = cowboy_req:parse_qs(ReqData), Qs = cowboy_req:parse_qs(ReqData),
proplists:get_value(Name, Qs, undefined). proplists:get_value(Name, Qs, undefined).
-spec catch_no_user_vhost(fun(() -> Result), Replacement) -> Result | Replacement. -spec catch_no_such_user_or_vhost(fun(() -> Result), Replacement) -> Result | Replacement.
catch_no_user_vhost(Fun, Replacement) -> catch_no_such_user_or_vhost(Fun, Replacement) ->
try try
Fun() Fun()
catch throw:{error, {E, _}} when E =:= no_such_user; E =:= no_such_vhost -> catch throw:{error, {E, _}} when E =:= no_such_user; E =:= no_such_vhost ->

2
deps/rabbitmq_management/src/rabbit_mgmt_wm_permission.erl vendored
View File

@ -88,7 +88,7 @@ perms(ReqData) ->
not_found -> not_found ->
not_found; not_found;
VHost -> VHost ->
rabbit_mgmt_util:catch_no_user_vhost( rabbit_mgmt_util:catch_no_such_user_or_vhost(
fun() -> fun() ->
Perms = Perms =
rabbit_auth_backend_internal:list_user_vhost_permissions( rabbit_auth_backend_internal:list_user_vhost_permissions(

2
deps/rabbitmq_management/src/rabbit_mgmt_wm_permissions_user.erl vendored
View File

@ -42,7 +42,7 @@ resource_exists(ReqData, Context) ->
to_json(ReqData, Context) -> to_json(ReqData, Context) ->
User = rabbit_mgmt_util:id(user, ReqData), User = rabbit_mgmt_util:id(user, ReqData),
rabbit_mgmt_util:catch_no_user_vhost( rabbit_mgmt_util:catch_no_such_user_or_vhost(
fun() -> fun() ->
Perms = rabbit_auth_backend_internal:list_user_permissions(User), Perms = rabbit_auth_backend_internal:list_user_permissions(User),
rabbit_mgmt_util:reply_list([[{user, User} | Rest] || Rest <- Perms], rabbit_mgmt_util:reply_list([[{user, User} | Rest] || Rest <- Perms],

2
deps/rabbitmq_management/src/rabbit_mgmt_wm_permissions_vhost.erl vendored
View File

@ -39,7 +39,7 @@ resource_exists(ReqData, Context) ->
to_json(ReqData, Context) -> to_json(ReqData, Context) ->
VHost = rabbit_mgmt_util:id(vhost, ReqData), VHost = rabbit_mgmt_util:id(vhost, ReqData),
rabbit_mgmt_util:catch_no_user_vhost( rabbit_mgmt_util:catch_no_such_user_or_vhost(
fun() -> fun() ->
Perms = rabbit_auth_backend_internal:list_vhost_permissions(VHost), Perms = rabbit_auth_backend_internal:list_vhost_permissions(VHost),
rabbit_mgmt_util:reply_list([[{vhost, VHost} | Rest] || Rest <- Perms], rabbit_mgmt_util:reply_list([[{vhost, VHost} | Rest] || Rest <- Perms],

2
deps/rabbitmq_management/src/rabbit_mgmt_wm_topic_permission.erl vendored
View File

@ -94,7 +94,7 @@ topic_perms(ReqData) ->
not_found -> not_found ->
not_found; not_found;
VHost -> VHost ->
rabbit_mgmt_util:catch_no_user_vhost( rabbit_mgmt_util:catch_no_such_user_or_vhost(
fun() -> fun() ->
Perms = Perms =
rabbit_auth_backend_internal:list_user_vhost_topic_permissions( rabbit_auth_backend_internal:list_user_vhost_topic_permissions(

2
deps/rabbitmq_management/src/rabbit_mgmt_wm_topic_permissions_user.erl vendored
View File

@ -42,7 +42,7 @@ resource_exists(ReqData, Context) ->
to_json(ReqData, Context) -> to_json(ReqData, Context) ->
User = rabbit_mgmt_util:id(user, ReqData), User = rabbit_mgmt_util:id(user, ReqData),
rabbit_mgmt_util:catch_no_user_vhost( rabbit_mgmt_util:catch_no_such_user_or_vhost(
fun() -> fun() ->
Perms = rabbit_auth_backend_internal:list_user_topic_permissions(User), Perms = rabbit_auth_backend_internal:list_user_topic_permissions(User),
rabbit_mgmt_util:reply_list([[{user, User} | Rest] || Rest <- Perms], rabbit_mgmt_util:reply_list([[{user, User} | Rest] || Rest <- Perms],

2
deps/rabbitmq_management/src/rabbit_mgmt_wm_topic_permissions_vhost.erl vendored
View File

@ -39,7 +39,7 @@ resource_exists(ReqData, Context) ->
to_json(ReqData, Context) -> to_json(ReqData, Context) ->
VHost = rabbit_mgmt_util:id(vhost, ReqData), VHost = rabbit_mgmt_util:id(vhost, ReqData),
rabbit_mgmt_util:catch_no_user_vhost( rabbit_mgmt_util:catch_no_such_user_or_vhost(
fun() -> fun() ->
Perms = rabbit_auth_backend_internal:list_vhost_topic_permissions(VHost), Perms = rabbit_auth_backend_internal:list_vhost_topic_permissions(VHost),
rabbit_mgmt_util:reply_list([[{vhost, VHost} | Rest] || Rest <- Perms], rabbit_mgmt_util:reply_list([[{vhost, VHost} | Rest] || Rest <- Perms],