@@ -76,35 +76,6 @@ delete_resource(ReqData, Context) ->
76
76
% % while the record uses '_'
77
77
IfUnused = <<" true" >> =:= rabbit_mgmt_util :qs_val (<<" if-unused" >>, ReqData ),
78
78
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
- >>>>>>> 7042 bc4864 (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
- >>>>>>> 685 c4f6027 (Resolve a conflict #10185 #10187 )
108
79
Name = rabbit_mgmt_util :id (queue , ReqData ),
109
80
rabbit_mgmt_util :direct_request (
110
81
'queue.delete' ,
0 commit comments