diff options
| author | Michael Klishin <klishinm@vmware.com> | 2021-09-10 13:53:37 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-10 13:53:37 +0300 |
| commit | 13ac078746c0f19635562f591a0b7e03b8a87c0c (patch) | |
| tree | ed24577bde91a9ed2a062b8e31dd84a0260c463a | |
| parent | 063d32626d110fedaef1f0ff8f09187a99fa967e (diff) | |
| parent | 3248895ec9eb6f8ea36c8a5ab2fcf139f79d1176 (diff) | |
| download | rabbitmq-server-git-13ac078746c0f19635562f591a0b7e03b8a87c0c.tar.gz | |
Merge pull request #3398 from rabbitmq/rabbitmq-server-3390
Revisit two rabbitmq.conf validators
| -rw-r--r-- | deps/rabbit/priv/schema/rabbit.schema | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/deps/rabbit/priv/schema/rabbit.schema b/deps/rabbit/priv/schema/rabbit.schema index adb68b3927..29e9ce6a33 100644 --- a/deps/rabbit/priv/schema/rabbit.schema +++ b/deps/rabbit/priv/schema/rabbit.schema @@ -743,7 +743,7 @@ end}. {mapping, "max_message_size", "rabbit.max_message_size", - [{datatype, integer}, {validators, ["less_then_512MB"]}]}. + [{datatype, integer}, {validators, ["max_message_size"]}]}. %% Customising Socket Options. %% @@ -1019,7 +1019,7 @@ end}. %% {mirroring_sync_batch_size, 4096}, {mapping, "mirroring_sync_batch_size", "rabbit.mirroring_sync_batch_size", - [{datatype, bytesize}, {validators, ["size_less_than_2G"]}]}. + [{datatype, bytesize}, {validators, ["mirroring_sync_batch_size"]}]}. %% Peer discovery backend used by cluster formation. %% @@ -2050,14 +2050,14 @@ end}. % Validators % =============================== -{validator, "size_less_than_2G", "Byte size should be less than 2G and greater than 0", +{validator, "mirroring_sync_batch_size", "Batch size should be greater than 0 and less than 1M", fun(Size) when is_integer(Size) -> - Size > 0 andalso Size < 2147483648 + Size > 0 andalso Size =< 1000000 end}. -{validator, "less_then_512MB", "Max message size should be less than 512MB and gre than 0", +{validator, "max_message_size", "Max message size should be between 0 and 512MB", fun(Size) when is_integer(Size) -> - Size > 0 andalso Size < 536870912 + Size > 0 andalso Size =< 536870912 end}. {validator, "less_than_1", "Float is not between 0 and 1", |