summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <michael@clojurewerkz.org>2020-09-24 23:16:14 +0300
committerMichael Klishin <michael@clojurewerkz.org>2020-09-24 23:22:03 +0300
commit8468954a87b9287a64d2936afed3a36b521462c4 (patch)
treecc2ec8955134c34a1dd3dd562d17b9dd96aaf3e0
parent17ef8504f878142c8756a15ef1a1fa072311a7ba (diff)
downloadrabbitmq-server-git-8468954a87b9287a64d2936afed3a36b521462c4.tar.gz
Update rabbit_definitions:apply_defs specs to feature returned errors
-rw-r--r--src/rabbit_definitions.erl10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/rabbit_definitions.erl b/src/rabbit_definitions.erl
index 9920015738..98f621996f 100644
--- a/src/rabbit_definitions.erl
+++ b/src/rabbit_definitions.erl
@@ -212,15 +212,15 @@ atomise_map_keys(Decoded) ->
Acc#{rabbit_data_coercion:to_atom(K, utf8) => V}
end, Decoded, Decoded).
--spec apply_defs(Map :: #{atom() => any()}, ActingUser :: rabbit_types:username()) -> 'ok'.
+-spec apply_defs(Map :: #{atom() => any()}, ActingUser :: rabbit_types:username()) -> 'ok' | {error, term()}.
apply_defs(Map, ActingUser) ->
apply_defs(Map, ActingUser, fun () -> ok end).
-spec apply_defs(Map :: #{atom() => any()}, ActingUser :: rabbit_types:username(),
- SuccessFun :: fun(() -> 'ok')) -> 'ok';
+ SuccessFun :: fun(() -> 'ok')) -> 'ok' | {error, term()};
(Map :: #{atom() => any()}, ActingUser :: rabbit_types:username(),
- VHost :: vhost:name()) -> 'ok'.
+ VHost :: vhost:name()) -> 'ok' | {error, term()}.
apply_defs(Map, ActingUser, VHost) when is_binary(VHost) ->
apply_defs(Map, ActingUser, fun () -> ok end, VHost);
@@ -253,7 +253,7 @@ apply_defs(Map, ActingUser, SuccessFun) when is_function(SuccessFun) ->
-spec apply_defs(Map :: #{atom() => any()},
ActingUser :: rabbit_types:username(),
SuccessFun :: fun(() -> 'ok'),
- VHost :: vhost:name()) -> 'ok'.
+ VHost :: vhost:name()) -> 'ok' | {error, term()}.
apply_defs(Map, ActingUser, SuccessFun, VHost) when is_binary(VHost) ->
rabbit_log:info("Asked to import definitions for a virtual host. Virtual host: ~p, acting user: ~p",
@@ -276,7 +276,7 @@ apply_defs(Map, ActingUser, SuccessFun, VHost) when is_binary(VHost) ->
ActingUser :: rabbit_types:username(),
SuccessFun :: fun(() -> 'ok'),
ErrorFun :: fun((any()) -> 'ok'),
- VHost :: vhost:name()) -> 'ok'.
+ VHost :: vhost:name()) -> 'ok' | {error, term()}.
apply_defs(Map, ActingUser, SuccessFun, ErrorFun, VHost) ->
rabbit_log:info("Asked to import definitions for a virtual host. Virtual host: ~p, acting user: ~p",