Skip to content

Commit 73c6f96

Browse files
committed
Remove rabbit_queue_type:feature_flag_name/1
As this functionality is covered by the rabbit_queue_type:is_enabled/1 API.
1 parent b8244f7 commit 73c6f96

File tree

2 files changed

+10
-21
lines changed

2 files changed

+10
-21
lines changed

deps/rabbit/src/rabbit_queue_type.erl

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
close/1,
2121
discover/1,
2222
short_alias_of/1,
23-
feature_flag_name/1,
2423
to_binary/1,
2524
default/0,
2625
default_alias/0,
@@ -335,15 +334,6 @@ short_alias_of(<<"stream">>) ->
335334
short_alias_of(_Other) ->
336335
undefined.
337336

338-
feature_flag_name(<<"quorum">>) ->
339-
quorum_queue;
340-
feature_flag_name(<<"classic">>) ->
341-
undefined;
342-
feature_flag_name(<<"stream">>) ->
343-
stream_queue;
344-
feature_flag_name(_) ->
345-
undefined.
346-
347337
%% If the client does not specify the type, the virtual host does not have any
348338
%% metadata default, and rabbit.default_queue_type is not set in the application env,
349339
%% use this type as the last resort.
@@ -374,7 +364,7 @@ to_binary(Other) ->
374364

375365
%% is a specific queue type implementation enabled
376366
-spec is_enabled(module()) -> boolean().
377-
is_enabled(Type) ->
367+
is_enabled(Type) when is_atom(Type) ->
378368
Type:is_enabled().
379369

380370
-spec is_compatible(module(), boolean(), boolean(), boolean()) ->

deps/rabbit/src/rabbit_vhost.erl

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -166,19 +166,18 @@ do_add(Name, Metadata, ActingUser) ->
166166
case Metadata of
167167
#{default_queue_type := DQT} ->
168168
%% check that the queue type is known
169-
rabbit_log:debug("Default queue type of virtual host '~ts' is ~tp", [Name, DQT]),
169+
rabbit_log:debug("Default queue type of virtual host '~ts' is ~tp",
170+
[Name, DQT]),
170171
try rabbit_queue_type:discover(DQT) of
171-
_ ->
172-
case rabbit_queue_type:feature_flag_name(DQT) of
173-
undefined -> ok;
174-
Flag when is_atom(Flag) ->
175-
case rabbit_feature_flags:is_enabled(Flag) of
176-
true -> ok;
177-
false -> throw({error, queue_type_feature_flag_is_not_enabled})
178-
end
172+
QueueType when is_atom(QueueType) ->
173+
case rabbit_queue_type:is_enabled(QueueType) of
174+
true ->
175+
ok;
176+
false ->
177+
throw({error, queue_type_feature_flag_is_not_enabled})
179178
end
180179
catch _:_ ->
181-
throw({error, invalid_queue_type, DQT})
180+
throw({error, invalid_queue_type, DQT})
182181
end;
183182
_ ->
184183
ok

0 commit comments

Comments
 (0)