Skip to content
This repository was archived by the owner on Nov 17, 2020. It is now read-only.

Move the location of the 'enabled_plugins' file #369

Closed
wants to merge 3 commits into from
Closed

Move the location of the 'enabled_plugins' file #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9291d72
Move the location of the 'enabled_plugins' file
HoloRin Mar 30, 2020
e96b9d1
Enhance 'enabled_plugins' fallback behavior
HoloRin Mar 31, 2020
7b55835
Make the default enabled_plugins location undefined
HoloRin Apr 2, 2020
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
8 changes: 2 additions & 6 deletions src/rabbit_env.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1080,16 +1080,12 @@ enabled_plugins_file(Context) ->
enabled_plugins_file_from_env(Context) ->
case get_prefixed_env_var("RABBITMQ_ENABLED_PLUGINS_FILE") of
false ->
File = get_default_enabled_plugins_file(Context),
update_context(Context, enabled_plugins_file, File, default);
update_context(Context, enabled_plugins_file, undefined, default);
Value ->
File = normalize_path(Value),
update_context(Context, enabled_plugins_file, File, environment)
end.

get_default_enabled_plugins_file(#{config_base_dir := ConfigBaseDir}) ->
filename:join(ConfigBaseDir, "enabled_plugins").

enabled_plugins_file_from_node(#{from_remote_node := Remote} = Context) ->
Ret = query_remote(Remote,
application, get_env, [rabbit, enabled_plugins_file]),
Expand Down Expand Up @@ -1471,7 +1467,7 @@ do_load_conf_env_file(Context, Sh, ConfEnvFile) ->
{"CONFIG_FILE", MainConfigFile},
{"ADVANCED_CONFIG_FILE", get_default_advanced_config_file(Context)},
{"MNESIA_BASE", get_default_mnesia_base_dir(Context)},
{"ENABLED_PLUGINS_FILE", get_default_enabled_plugins_file(Context)},
{"ENABLED_PLUGINS_FILE", false},
{"PLUGINS_DIR", get_default_plugins_path_from_env(Context)},
{"CONF_ENV_FILE_PHASE", "rabbtimq-prelaunch"}
],
Expand Down
76 changes: 39 additions & 37 deletions test/rabbit_env_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,48 +64,50 @@

all() ->
[
check_data_dir,
check_default_values,
check_values_from_reachable_remote_node,
check_values_from_offline_remote_node,
check_context_to_app_env_vars,
check_context_to_code_path,
check_RABBITMQ_ADVANCED_CONFIG_FILE,
check_RABBITMQ_CONFIG_FILE,
check_RABBITMQ_CONFIG_FILES,
check_RABBITMQ_DIST_PORT,
check_RABBITMQ_ENABLED_PLUGINS,
check_RABBITMQ_ENABLED_PLUGINS_FILE,
check_RABBITMQ_FEATURE_FLAGS_FILE,
check_RABBITMQ_KEEP_PID_FILE_ON_EXIT,
check_RABBITMQ_LOG,
check_RABBITMQ_LOG_BASE,
check_RABBITMQ_LOGS,
check_RABBITMQ_MNESIA_BASE,
check_RABBITMQ_MNESIA_DIR,
check_RABBITMQ_MOTD_FILE,
check_RABBITMQ_NODE_IP_ADDRESS,
check_RABBITMQ_NODE_PORT,
check_RABBITMQ_NODENAME,
check_RABBITMQ_PID_FILE,
check_RABBITMQ_PLUGINS_DIR,
check_RABBITMQ_PLUGINS_EXPAND_DIR,
check_RABBITMQ_PRODUCT_NAME,
check_RABBITMQ_PRODUCT_VERSION,
check_RABBITMQ_QUORUM_DIR,
check_RABBITMQ_UPGRADE_LOG,
check_RABBITMQ_USE_LOGNAME,
check_value_is_yes,
check_log_process_env,
check_log_context
{group, main_tests}
].

suite() ->
[{timetrap, {seconds, 10}}].

groups() ->
[
{parallel_tests, [parallel], all()}
{main_tests, [], [
check_data_dir,
check_default_values,
check_values_from_reachable_remote_node,
check_values_from_offline_remote_node,
check_context_to_app_env_vars,
check_context_to_code_path,
check_RABBITMQ_ADVANCED_CONFIG_FILE,
check_RABBITMQ_CONFIG_FILE,
check_RABBITMQ_CONFIG_FILES,
check_RABBITMQ_DIST_PORT,
check_RABBITMQ_ENABLED_PLUGINS,
check_RABBITMQ_ENABLED_PLUGINS_FILE,
check_RABBITMQ_FEATURE_FLAGS_FILE,
check_RABBITMQ_KEEP_PID_FILE_ON_EXIT,
check_RABBITMQ_LOG,
check_RABBITMQ_LOG_BASE,
check_RABBITMQ_LOGS,
check_RABBITMQ_MNESIA_BASE,
check_RABBITMQ_MNESIA_DIR,
check_RABBITMQ_MOTD_FILE,
check_RABBITMQ_NODE_IP_ADDRESS,
check_RABBITMQ_NODE_PORT,
check_RABBITMQ_NODENAME,
check_RABBITMQ_PID_FILE,
check_RABBITMQ_PLUGINS_DIR,
check_RABBITMQ_PLUGINS_EXPAND_DIR,
check_RABBITMQ_PRODUCT_NAME,
check_RABBITMQ_PRODUCT_VERSION,
check_RABBITMQ_QUORUM_DIR,
check_RABBITMQ_UPGRADE_LOG,
check_RABBITMQ_USE_LOGNAME,
check_value_is_yes,
check_log_process_env,
check_log_context
]}
].

init_per_group(_, Config) -> Config.
Expand Down Expand Up @@ -203,7 +205,7 @@ check_default_values(_) ->
dbg_mods => [],
dbg_output => stdout,
enabled_plugins => undefined,
enabled_plugins_file => "/etc/rabbitmq/enabled_plugins",
enabled_plugins_file => undefined,
erlang_dist_tcp_port => 25672,
feature_flags_file =>
"/var/lib/rabbitmq/mnesia/" ++ NodeS ++ "-feature_flags",
Expand Down Expand Up @@ -250,7 +252,7 @@ check_default_values(_) ->
dbg_mods => [],
dbg_output => stdout,
enabled_plugins => undefined,
enabled_plugins_file => "%APPDATA%/RabbitMQ/enabled_plugins",
enabled_plugins_file => undefined,
erlang_dist_tcp_port => 25672,
feature_flags_file =>
"%APPDATA%/RabbitMQ/db/" ++ NodeS ++ "-feature_flags",
Expand Down