Skip to content

Commit daa48f5

Browse files
Resolve a conflict #10187 #10185 #10189
1 parent a178ca8 commit daa48f5

File tree

1 file changed

+0
-29
lines changed

1 file changed

+0
-29
lines changed

deps/rabbitmq_management/src/rabbit_mgmt_wm_queue.erl

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -76,35 +76,6 @@ delete_resource(ReqData, Context) ->
7676
%% while the record uses '_'
7777
IfUnused = <<"true">> =:= rabbit_mgmt_util:qs_val(<<"if-unused">>, ReqData),
7878
IfEmpty = <<"true">> =:= rabbit_mgmt_util:qs_val(<<"if-empty">>, ReqData),
79-
<<<<<<< HEAD
80-
<<<<<<< HEAD
81-
VHost = rabbit_mgmt_util:id(vhost, ReqData),
82-
=======
83-
<<<<<<< HEAD
84-
VHost = rabbit_mgmt_util:id(vhost, ReqData),
85-
>>>>>>> 7042bc4864 (Revert "HTTP API: DELETE /api/queues/{vhost}/{name} use internal API call")
86-
QName = rabbit_mgmt_util:id(queue, ReqData),
87-
Name = rabbit_misc:r(VHost, queue, QName),
88-
case rabbit_amqqueue:lookup(Name) of
89-
{ok, Q} ->
90-
case rabbit_amqqueue:delete(Q, IfUnused, IfEmpty, ActingUser) of
91-
{ok, _} ->
92-
{true, ReqData, Context};
93-
{error, not_empty} ->
94-
Explanation = io_lib:format("~ts not empty", [rabbit_misc:rs(Name)]),
95-
rabbit_log:warning("Delete queue error: ~ts", [Explanation]),
96-
rabbit_mgmt_util:bad_request(list_to_binary(Explanation), ReqData, Context);
97-
{error, in_use} ->
98-
Explanation = io_lib:format("~ts in use", [rabbit_misc:rs(Name)]),
99-
rabbit_log:warning("Delete queue error: ~ts", [Explanation]),
100-
rabbit_mgmt_util:bad_request(list_to_binary(Explanation), ReqData, Context)
101-
end;
102-
{error, not_found} ->
103-
{true, ReqData, Context}
104-
end.
105-
=======
106-
=======
107-
>>>>>>> 685c4f6027 (Resolve a conflict #10185 #10187)
10879
Name = rabbit_mgmt_util:id(queue, ReqData),
10980
rabbit_mgmt_util:direct_request(
11081
'queue.delete',

0 commit comments

Comments
 (0)