Skip to content

Commit 5b95af1

Browse files
SimonUngemichaelklishin
authored andcommitted
Use infinity as config instead of 0
1 parent 49f390a commit 5b95af1

File tree

3 files changed

+19
-3
lines changed

3 files changed

+19
-3
lines changed

deps/rabbit/priv/schema/rabbit.schema

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -890,7 +890,19 @@ end}.
890890
{mapping, "channel_max", "rabbit.channel_max", [{datatype, integer}]}.
891891

892892
{mapping, "channel_max_per_node", "rabbit.channel_max_per_node",
893-
[{datatype, integer}, {validators, ["non_negative_integer"]}]}.
893+
[{datatype, [{atom, infinity}, integer]}]}.
894+
895+
{translation, "rabbit.channel_max_per_node",
896+
fun(Conf) ->
897+
case cuttlefish:conf_get("channel_max_per_node", Conf, undefined) of
898+
undefined -> cuttlefish:unset();
899+
infinity -> infinity;
900+
Val when is_integer(Val) andalso Val > 0 -> Val;
901+
_ -> cuttlefish:invalid("should be positive integer or 'infinity'")
902+
end
903+
end
904+
}.
905+
894906

895907
%% Set the max permissible number of client connections per node.
896908
%% `infinity` means "no limit".

deps/rabbit/src/rabbit_reader.erl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -942,8 +942,8 @@ is_over_limits(Username) ->
942942
end.
943943

944944
is_over_node_channel_limit() ->
945-
case rabbit_misc:get_env(rabbit, channel_max_per_node, 0) of
946-
0 ->
945+
case rabbit_misc:get_env(rabbit, channel_max_per_node, infinity) of
946+
infinity ->
947947
false;
948948
NodeLimit ->
949949
%% Only fetch this if a limit is set

deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,10 @@ tcp_listen_options.exit_on_close = false",
400400
"channel_max_per_node = 16",
401401
[{rabbit,[{channel_max_per_node, 16}]}],
402402
[]},
403+
{channel_max_per_node,
404+
"channel_max_per_node = infinity",
405+
[{rabbit,[{channel_max_per_node, infinity}]}],
406+
[]},
403407
{max_message_size,
404408
"max_message_size = 131072",
405409
[{rabbit, [{max_message_size, 131072}]}],

0 commit comments

Comments
 (0)