Skip to content

Commit 7c66fba

Browse files
Make it possible to clear cluster_tags via rabbitmq.conf
1 parent 9e649ae commit 7c66fba

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

deps/rabbit/src/rabbit.erl

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
%%---------------------------------------------------------------------------
4040
%% Boot steps.
41-
-export([maybe_set_cluster_tags/0, maybe_insert_default_data/0, boot_delegate/0, recover/0,
41+
-export([update_cluster_tags/0, maybe_insert_default_data/0, boot_delegate/0, recover/0,
4242
pg_local_amqp_session/0,
4343
pg_local_amqp_connection/0]).
4444

@@ -211,7 +211,7 @@
211211

212212
-rabbit_boot_step({cluster_tags,
213213
[{description, "Set cluster tags"},
214-
{mfa, {?MODULE, maybe_set_cluster_tags, []}},
214+
{mfa, {?MODULE, update_cluster_tags, []}},
215215
{requires, core_initialized}]}).
216216

217217
-rabbit_boot_step({routing_ready,
@@ -1145,17 +1145,13 @@ pg_local_scope(Prefix) ->
11451145
list_to_atom(io_lib:format("~s_~s", [Prefix, node()])).
11461146

11471147

1148-
-spec maybe_set_cluster_tags() -> 'ok'.
1148+
-spec update_cluster_tags() -> 'ok'.
11491149

1150-
maybe_set_cluster_tags() ->
1150+
update_cluster_tags() ->
11511151
Tags = application:get_env(rabbit, cluster_tags, []),
1152-
case Tags of
1153-
[] -> ok;
1154-
Value ->
1155-
?LOG_DEBUG("Seeding cluster tags from application environment key...",
1152+
?LOG_DEBUG("Seeding cluster tags from application environment key...",
11561153
#{domain => ?RMQLOG_DOMAIN_GLOBAL}),
1157-
rabbit_runtime_parameters:set_global(cluster_tags, Value, <<"internal_user">>)
1158-
end.
1154+
rabbit_runtime_parameters:set_global(cluster_tags, Tags, <<"internal_user">>).
11591155

11601156
-spec maybe_insert_default_data() -> 'ok'.
11611157

0 commit comments

Comments
 (0)