diff --git a/src/rabbit_env.erl b/src/rabbit_env.erl index 1397ced7..6010c5db 100644 --- a/src/rabbit_env.erl +++ b/src/rabbit_env.erl @@ -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]), @@ -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"} ], diff --git a/test/rabbit_env_SUITE.erl b/test/rabbit_env_SUITE.erl index 3db0ce89..b315e120 100644 --- a/test/rabbit_env_SUITE.erl +++ b/test/rabbit_env_SUITE.erl @@ -64,40 +64,7 @@ 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() -> @@ -105,7 +72,42 @@ suite() -> 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. @@ -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", @@ -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",