Log incorrectly claims the limit is per node, but the component count…

… is over all vhost in the cluster
rabbitmq · Jan 24, 2025 · 3702b00 · 3702b00
1 parent a9e972f
commit 3702b00
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/deps/rabbit/src/rabbit_runtime_parameters.erl b/deps/rabbit/src/rabbit_runtime_parameters.erl
@@ -166,10 +166,10 @@ is_within_limit(Component) ->
     case Limit < 0 orelse count_component(Component) < Limit of
        true -> ok;
        false ->
-            ErrorMsg = "Limit reached: component ~ts is limited to ~tp per node",
+            ErrorMsg = "Limit reached: component ~ts is limited to ~tp",
             ErrorArgs = [Component, Limit],
             rabbit_log:error(ErrorMsg, ErrorArgs),
-            {errors, [{"component ~ts is limited to ~tp per node", [Component, Limit]}]}
+            {errors, [{"component ~ts is limited to ~tp", [Component, Limit]}]}
     end.
 
 count_component(Component) -> length(list_component(Component)).

diff --git a/deps/rabbit/test/runtime_parameters_SUITE.erl b/deps/rabbit/test/runtime_parameters_SUITE.erl
@@ -55,7 +55,7 @@ test_limits(Config) ->
 test_limits1(_Config) ->
     dummy_runtime_parameters:register(),
     application:set_env(rabbit, runtime_parameters, [{limits, [{<<"test">>, 1}]}]),
-    E  = {error_string, "Validation failed\n\ncomponent test is limited to 1 per node\n"},
+    E  = {error_string, "Validation failed\n\ncomponent test is limited to 1\n"},
     ok = rabbit_runtime_parameters:set_any(<<"/">>, <<"test">>, <<"good">>, <<"">>, none),
     E  = rabbit_runtime_parameters:set_any(<<"/">>, <<"test">>, <<"good">>, <<"">>, none),
     dummy_runtime_parameters:unregister().