Merge pull request #8822 from rabbitmq/mergify/bp/v3.12.x/pr-8820

Naming follow-up to #8790 (backport #8820)

Author: michaelklishin

deps/rabbitmq_web_mqtt/priv/schema/rabbitmq_web_mqtt.schema

@@ -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]}}
     ]}.

deps/rabbitmq_web_mqtt/src/rabbit_web_mqtt_handler.erl

@@ -79,7 +79,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")

deps/rabbitmq_web_mqtt/test/config_schema_SUITE_data/rabbitmq_web_mqtt.snippets

@@ -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,

deps/rabbitmq_web_stomp/priv/schema/rabbitmq_web_stomp.schema

@@ -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]}}
     ]}.

deps/rabbitmq_web_stomp/src/rabbit_web_stomp_handler.erl

@@ -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")

deps/rabbitmq_web_stomp/test/config_schema_SUITE_data/rabbitmq_web_stomp.snippets

@@ -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,

release-notes/3.12.2.md

@@ -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)
 
@@ -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)