Skip to content

Commit 9b2c6d9

Browse files
committed
rabbit_env: Drop $RABBITMQ_LOG_FF_REGISTRY
[Why] Its use was removed when the registry was converted from a compiled module to a persistent_term.
1 parent 6a0008b commit 9b2c6d9

File tree

2 files changed

+0
-20
lines changed

2 files changed

+0
-20
lines changed

deps/rabbit_common/src/rabbit_env.erl

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
"RABBITMQ_KEEP_PID_FILE_ON_EXIT",
6666
"RABBITMQ_LOG",
6767
"RABBITMQ_LOG_BASE",
68-
"RABBITMQ_LOG_FF_REGISTRY",
6968
"RABBITMQ_LOGS",
7069
"RABBITMQ_MNESIA_BASE",
7170
"RABBITMQ_MNESIA_DIR",
@@ -150,7 +149,6 @@ get_context_after_reloading_env(Context) ->
150149
fun keep_pid_file_on_exit/1,
151150
fun feature_flags_file/1,
152151
fun forced_feature_flags_on_init/1,
153-
fun log_feature_flags_registry/1,
154152
fun plugins_path/1,
155153
fun plugins_expand_dir/1,
156154
fun enabled_plugins_file/1,
@@ -1010,17 +1008,6 @@ forced_feature_flags_on_init(Context) ->
10101008
forced_feature_flags_on_init, FeatureNames, environment)
10111009
end.
10121010

1013-
log_feature_flags_registry(Context) ->
1014-
case get_prefixed_env_var("RABBITMQ_LOG_FF_REGISTRY") of
1015-
false ->
1016-
update_context(Context,
1017-
log_feature_flags_registry, false, default);
1018-
Value ->
1019-
Log = value_is_yes(Value),
1020-
update_context(Context,
1021-
log_feature_flags_registry, Log, environment)
1022-
end.
1023-
10241011
%% -------------------------------------------------------------------
10251012
%%
10261013
%% RABBITMQ_PLUGINS_DIR

deps/rabbit_common/test/rabbit_env_SUITE.erl

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@ check_default_values(_) ->
187187
interactive_shell => default,
188188
keep_pid_file_on_exit => default,
189189
log_base_dir => default,
190-
log_feature_flags_registry => default,
191190
log_levels => default,
192191
main_config_file => default,
193192
main_log_file => default,
@@ -231,7 +230,6 @@ check_default_values(_) ->
231230
interactive_shell => false,
232231
keep_pid_file_on_exit => false,
233232
log_base_dir => "/var/log/rabbitmq",
234-
log_feature_flags_registry => false,
235233
log_levels => undefined,
236234
main_config_file => "/etc/rabbitmq/rabbitmq",
237235
main_log_file => "/var/log/rabbitmq/" ++ NodeS ++ ".log",
@@ -282,7 +280,6 @@ check_default_values(_) ->
282280
interactive_shell => false,
283281
keep_pid_file_on_exit => false,
284282
log_base_dir => "%APPDATA%/RabbitMQ/log",
285-
log_feature_flags_registry => false,
286283
log_levels => undefined,
287284
main_config_file => "%APPDATA%/RabbitMQ/rabbitmq",
288285
main_log_file => "%APPDATA%/RabbitMQ/log/" ++ NodeS ++ ".log",
@@ -408,7 +405,6 @@ check_values_from_reachable_remote_node(Config) ->
408405
interactive_shell => default,
409406
keep_pid_file_on_exit => default,
410407
log_base_dir => default,
411-
log_feature_flags_registry => default,
412408
log_levels => default,
413409
main_config_file => default,
414410
main_log_file => default,
@@ -452,7 +448,6 @@ check_values_from_reachable_remote_node(Config) ->
452448
interactive_shell => false,
453449
keep_pid_file_on_exit => false,
454450
log_base_dir => "/var/log/rabbitmq",
455-
log_feature_flags_registry => false,
456451
log_levels => undefined,
457452
main_config_file => "/etc/rabbitmq/rabbitmq",
458453
main_log_file => "/var/log/rabbitmq/" ++ NodeS ++ ".log",
@@ -540,7 +535,6 @@ check_values_from_offline_remote_node(_) ->
540535
interactive_shell => default,
541536
keep_pid_file_on_exit => default,
542537
log_base_dir => default,
543-
log_feature_flags_registry => default,
544538
log_levels => default,
545539
main_config_file => default,
546540
main_log_file => default,
@@ -584,7 +578,6 @@ check_values_from_offline_remote_node(_) ->
584578
interactive_shell => false,
585579
keep_pid_file_on_exit => false,
586580
log_base_dir => "/var/log/rabbitmq",
587-
log_feature_flags_registry => false,
588581
log_levels => undefined,
589582
main_config_file => "/etc/rabbitmq/rabbitmq",
590583
main_log_file => "/var/log/rabbitmq/" ++ NodeS ++ ".log",

0 commit comments

Comments
 (0)