summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/rabbit_definitions.erl6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/rabbit_definitions.erl b/src/rabbit_definitions.erl
index 6336fe4f31..53fa159b29 100644
--- a/src/rabbit_definitions.erl
+++ b/src/rabbit_definitions.erl
@@ -352,8 +352,8 @@ do_concurrent_for_all(List, WorkPoolFun) ->
fun() ->
try
WorkPoolFun(M)
- catch _:E -> gatherer:in(Gatherer, {error, E});
- {error, E} -> gatherer:in(Gatherer, {error, E})
+ catch {error, E} -> gatherer:in(Gatherer, {error, E});
+ _:E -> gatherer:in(Gatherer, {error, E})
end,
gatherer:finish(Gatherer)
end)
@@ -633,8 +633,6 @@ validate_vhost_queue_limit(VHost, AddCount, {true, Limit, QueueCount}) ->
ErrMsg = rabbit_misc:format(ErrFmt, ErrInfo),
exit({vhost_limit_exceeded, ErrMsg}).
-atomise_name(N) -> rabbit_data_coercion:to_atom(N).
-
get_or_missing(K, L) ->
case maps:get(K, L, undefined) of
undefined -> {key_missing, K};