diff options
| author | David Ansari <david.ansari@gmx.de> | 2023-05-15 10:06:01 +0000 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2023-05-15 14:14:17 +0000 |
| commit | 6eb7458b103da3f5ec7e80394e7c87ea7a72df11 (patch) | |
| tree | 76e007b32dc8843491fba74f8b98d74d9741c08b | |
| parent | 06e66c0004b768f35d5d56939d158b8f9371b1e0 (diff) | |
| download | rabbitmq-server-git-6eb7458b103da3f5ec7e80394e7c87ea7a72df11.tar.gz | |
Change rabbitmq.conf key to message_interceptors.incoming.*
as it nicer categorises if there will be a future
"message_interceptors.outgoing.*" key.
We leave the advanced config file key because simple single value
settings should not require using the advanced config file.
(cherry picked from commit ddabc3519117c1556ef1a5467931242d07e5f425)
| -rw-r--r-- | deps/rabbit/priv/schema/rabbit.schema | 6 | ||||
| -rw-r--r-- | deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/deps/rabbit/priv/schema/rabbit.schema b/deps/rabbit/priv/schema/rabbit.schema index fcb5023057..7b3f61b90d 100644 --- a/deps/rabbit/priv/schema/rabbit.schema +++ b/deps/rabbit/priv/schema/rabbit.schema @@ -2481,12 +2481,12 @@ end}. %% %% Message interceptors %% -{mapping, "incoming_message_interceptors.$interceptor.overwrite", "rabbit.incoming_message_interceptors", [ +{mapping, "message_interceptors.incoming.$interceptor.overwrite", "rabbit.incoming_message_interceptors", [ {datatype, {enum, [true, false]}}]}. {translation, "rabbit.incoming_message_interceptors", fun(Conf) -> - case cuttlefish_variable:filter_by_prefix("incoming_message_interceptors", Conf) of + case cuttlefish_variable:filter_by_prefix("message_interceptors", Conf) of [] -> cuttlefish:unset(); L -> @@ -2499,7 +2499,7 @@ end}. false -> cuttlefish:invalid(io_lib:format("~p is invalid", [Interceptor])) end - end || {["incoming_message_interceptors", Interceptor0, "overwrite"], Overwrite} <- L] + end || {["message_interceptors", "incoming", Interceptor0, "overwrite"], Overwrite} <- L] end end }. diff --git a/deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets b/deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets index 555e39479c..c1c5cc87c9 100644 --- a/deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets +++ b/deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets @@ -934,7 +934,7 @@ credential_validator.regexp = ^abc\\d+", %% {message_interceptors, - "incoming_message_interceptors.set_header_timestamp.overwrite = true", + "message_interceptors.incoming.set_header_timestamp.overwrite = true", [{rabbit, [ {incoming_message_interceptors, [{set_header_timestamp, true}]} ]}], @@ -942,8 +942,8 @@ credential_validator.regexp = ^abc\\d+", {message_interceptors, " - incoming_message_interceptors.set_header_routing_node.overwrite = false - incoming_message_interceptors.set_header_timestamp.overwrite = false + message_interceptors.incoming.set_header_routing_node.overwrite = false + message_interceptors.incoming.set_header_timestamp.overwrite = false ", [{rabbit, [ {incoming_message_interceptors, [{set_header_routing_node, false}, |