@@ -104,16 +104,10 @@ child_exists(Name) ->
104
104
mirrored_supervisor :which_children (? SUPERVISOR )).
105
105
106
106
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 }) ||
108
108
{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
+ ],
117
111
ok ;
118
112
adjust (Reason ) ->
119
113
_ = [case Id of
@@ -176,3 +170,13 @@ simple_id(#exchange{name = #resource{virtual_host = VHost, name = Name}}) ->
176
170
old_id (X = # exchange {policy = Policy }) ->
177
171
X1 = rabbit_exchange :immutable (X ),
178
172
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