Skip to content

Naming follow-up to #8790 #8820

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michaelklishin merged 2 commits into from
Jul 10, 2023
Merged

Naming follow-up to #8790 #8820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71a23c3
Renaming in follow-up to #8790
michaelklishin Jul 10, 2023
ba101a4
Update 3.12.2 release notes
michaelklishin Jul 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deps/rabbitmq_web_mqtt/priv/schema/rabbitmq_web_mqtt.schema
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ end}.
%% File Handle Cache
%%

{mapping, "web_mqtt.enable_file_handle_cache", "rabbitmq_web_mqtt.enable_file_handle_cache",
{mapping, "web_mqtt.use_file_handle_cache", "rabbitmq_web_mqtt.use_file_handle_cache",
[
{datatype, {enum, [true, false]}}
]}.
2 changes: 1 addition & 1 deletion deps/rabbitmq_web_mqtt/src/rabbit_web_mqtt_handler.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ init(Req, Opts) ->
false ->
no_supported_sub_protocol(Protocol, Req);
true ->
ShouldUseFHC = application:get_env(?APP, enable_file_handle_cache, true),
ShouldUseFHC = application:get_env(?APP, use_file_handle_cache, true),
case ShouldUseFHC of
true -> ?LOG_INFO("Web MQTT: file handle cache use is enabled");
false -> ?LOG_INFO("Web MQTT: file handle cache use is disabled")
Expand Down
12 changes: 6 additions & 6 deletions deps/rabbitmq_web_mqtt/test/config_schema_SUITE_data/rabbitmq_web_mqtt.snippets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,16 @@
[{max_connections, 5000}]}],
[rabbitmq_web_mqtt]},

{enable_file_handle_cache_is_disabled,
"web_mqtt.enable_file_handle_cache = false",
{use_file_handle_cache_is_off,
"web_mqtt.use_file_handle_cache = false",
[{rabbitmq_web_mqtt,
[{enable_file_handle_cache, false}]}],
[{use_file_handle_cache, false}]}],
[rabbitmq_web_mqtt]},

{enable_file_handle_cache_is_enabled,
"web_mqtt.enable_file_handle_cache = true",
{use_file_handle_cache_is_on,
"web_mqtt.use_file_handle_cache = true",
[{rabbitmq_web_mqtt,
[{enable_file_handle_cache, true}]}],
[{use_file_handle_cache, true}]}],
[rabbitmq_web_mqtt]},

{ssl_listener,
Expand Down
2 changes: 1 addition & 1 deletion deps/rabbitmq_web_stomp/priv/schema/rabbitmq_web_stomp.schema
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ end}.
%% File Handle Cache
%%

{mapping, "web_stomp.enable_file_handle_cache", "rabbitmq_web_stomp.enable_file_handle_cache",
{mapping, "web_stomp.use_file_handle_cache", "rabbitmq_web_stomp.use_file_handle_cache",
[
{datatype, {enum, [true, false]}}
]}.
2 changes: 1 addition & 1 deletion deps/rabbitmq_web_stomp/src/rabbit_web_stomp_handler.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ init(Req0, Opts) ->
end,
WsOpts0 = proplists:get_value(ws_opts, Opts, #{}),
WsOpts = maps:merge(#{compress => true}, WsOpts0),
ShouldUseFHC = application:get_env(?APP, enable_file_handle_cache, true),
ShouldUseFHC = application:get_env(?APP, use_file_handle_cache, true),
case ShouldUseFHC of
true -> ?LOG_INFO("Web STOMP: file handle cache use is enabled");
false -> ?LOG_INFO("Web STOMP: file handle cache use is disabled")
Expand Down
12 changes: 6 additions & 6 deletions deps/rabbitmq_web_stomp/test/config_schema_SUITE_data/rabbitmq_web_stomp.snippets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,16 @@
[{max_connections, 5000}]}],
[rabbitmq_web_stomp]},

{enable_file_handle_cache_is_disabled,
"web_stomp.enable_file_handle_cache = false",
{use_file_handle_cache_is_off,
"web_stomp.use_file_handle_cache = false",
[{rabbitmq_web_stomp,
[{enable_file_handle_cache, false}]}],
[{use_file_handle_cache, false}]}],
[rabbitmq_web_stomp]},

{enable_file_handle_cache_is_enabled,
"web_stomp.enable_file_handle_cache = true",
{use_file_handle_cache_is_on,
"web_stomp.use_file_handle_cache = true",
[{rabbitmq_web_stomp,
[{enable_file_handle_cache, true}]}],
[{use_file_handle_cache, true}]}],
[rabbitmq_web_stomp]},

{ssl_listener,
Expand Down
12 changes: 10 additions & 2 deletions release-notes/3.12.2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,11 @@ Release notes can be found on GitHub at [rabbitmq-server/release-notes](https://

#### Enhacements

* It is now possible to opt in to deactivate file handle cache use in the plugin.
* It is now possible to opt in to deactivate file handle cache use in the plugin:

``` ini
web_mqtt.use_file_handle_cache = false
```

GitHub issue: [#8790](https://github.com/rabbitmq/rabbitmq-server/pull/8790)

Expand All @@ -124,7 +128,11 @@ Release notes can be found on GitHub at [rabbitmq-server/release-notes](https://

#### Enhacements

* It is now possible to opt in to deactivate file handle cache use in the plugin.
* It is now possible to opt in to deactivate file handle cache use in the plugin:

``` ini
web_stomp.use_file_handle_cache = false
```

GitHub issue: [#8790](https://github.com/rabbitmq/rabbitmq-server/pull/8790)

Expand Down