Skip to content

Commit f2131c6

Browse files
Naming #11304
'user_provided_plugins_data_dir' make it immediately obvious that the data directory is for 3rd party plugins (user-provided plugins), and it is not set up or used internally by RabbitMQ.
1 parent 3442c91 commit f2131c6

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

deps/rabbit/src/rabbit_mnesia.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1067,7 +1067,7 @@ mnesia_and_msg_store_files() ->
10671067
rabbit_node_monitor:quorum_filename(),
10681068
rabbit_feature_flags:enabled_feature_flags_list_file(),
10691069
rabbit_khepri:dir(),
1070-
rabbit_plugins:plugins_data_dir()],
1070+
rabbit_plugins:user_provided_plugins_data_dir()],
10711071
IgnoredFiles = [filename:basename(File) || File <- IgnoredFiles0],
10721072
?LOG_DEBUG("Files and directories found in node's data directory: ~ts, of them to be ignored: ~ts",
10731073
[string:join(lists:usort(List0), ", "), string:join(lists:usort(IgnoredFiles), ", ")]),

deps/rabbit/src/rabbit_plugins.erl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
-export([validate_plugins/1, format_invalid_plugins/1]).
1414
-export([is_strictly_plugin/1, strictly_plugins/2, strictly_plugins/1]).
1515
-export([plugins_dir/0, plugin_names/1, plugins_expand_dir/0, enabled_plugins_file/0]).
16-
-export([plugins_data_dir/0]).
16+
-export([user_provided_plugins_data_dir/0]).
1717
-export([is_enabled/1, is_enabled_on_node/2, enabled_plugins/0]).
1818
-export([which_plugin/1]).
1919

@@ -94,13 +94,13 @@ plugins_dir() ->
9494
filename:join([rabbit:data_dir(), "plugins_dir_stub"])
9595
end.
9696

97-
plugins_data_dir() ->
98-
case application:get_env(rabbit, plugins_data_dir) of
97+
user_provided_plugins_data_dir() ->
98+
case application:get_env(rabbit, user_provided_plugins_data_dir) of
9999
{ok, PluginsDataDir} ->
100100
PluginsDataDir;
101101
_ ->
102102
DataDir = rabbit_mnesia:dir(),
103-
filename:join([DataDir, "plugins_data_dir"])
103+
filename:join([DataDir, "user_provided_plugins_data_dir"])
104104
end.
105105

106106
-spec enabled_plugins_file() -> file:filename().

deps/rabbit/test/metadata_store_migration_SUITE.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ from_mnesia_to_khepri(Config) ->
124124
Maintenance = rabbit_ct_broker_helpers:rpc(Config, 0, rabbit_db_maintenance, get, [Server]),
125125
?assertNot(undefined == Maintenance),
126126

127-
PluginsDataDir = rabbit_ct_broker_helpers:rpc(Config, 0, rabbit_plugins, plugins_data_dir, []),
127+
PluginsDataDir = rabbit_ct_broker_helpers:rpc(Config, 0, rabbit_plugins, user_provided_plugins_data_dir, []),
128128
ok = file:make_dir(PluginsDataDir),
129129
PluginDataFile = filename:join(PluginsDataDir, "test.txt"),
130130
ok = file:write_file(PluginDataFile, "test content"),

0 commit comments

Comments
 (0)