Skip to content

Commit 80df65e

Browse files
rabbit_federation_exchange_link_sup_sup: avoid an export from a case expression
(cherry picked from commit a879138)
1 parent 6f79af0 commit 80df65e

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

deps/rabbitmq_federation/src/rabbit_federation_exchange_link_sup_sup.erl

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -104,16 +104,10 @@ child_exists(Name) ->
104104
mirrored_supervisor:which_children(?SUPERVISOR)).
105105

106106
adjust({clear_upstream, VHost, UpstreamName}) ->
107-
_ = [rabbit_federation_link_sup:adjust(Pid, X, {clear_upstream, UpstreamName}) ||
107+
_ = [rabbit_federation_link_sup:adjust(Pid, exchange_record_from_child_id(Id), {clear_upstream, UpstreamName}) ||
108108
{Id, Pid, _, _} <- mirrored_supervisor:which_children(?SUPERVISOR),
109-
case Id of
110-
{_, #exchange{name = Name} = X} ->
111-
Name#resource.virtual_host == VHost;
112-
#exchange{name = Name} = X ->
113-
%% Old child id format, pre 3.13.0
114-
Name#resource.virtual_host == VHost
115-
end
116-
],
109+
virtual_host_name_from_child_id(Id) =:= VHost
110+
],
117111
ok;
118112
adjust(Reason) ->
119113
_ = [case Id of
@@ -176,3 +170,13 @@ simple_id(#exchange{name = #resource{virtual_host = VHost, name = Name}}) ->
176170
old_id(X = #exchange{policy = Policy}) ->
177171
X1 = rabbit_exchange:immutable(X),
178172
X1#exchange{policy = Policy}.
173+
174+
exchange_record_from_child_id({_, #exchange{} = XR}) ->
175+
XR;
176+
exchange_record_from_child_id(#exchange{} = XR) ->
177+
XR.
178+
179+
virtual_host_name_from_child_id({_, #exchange{name = Res}}) ->
180+
Res#resource.virtual_host;
181+
virtual_host_name_from_child_id(#exchange{name = Res}) ->
182+
Res#resource.virtual_host.

0 commit comments

Comments
 (0)