root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #12174 from rabbitmq/mergify/bp/v4.0.x/pr-12172 

Minor fix: GET/HEAD method on non existing shovel crash (backport #12172)
This commit is contained in:
Michael Klishin 2024-08-29 17:43:51 -04:00 committed by GitHub
parent 16c95b9566 93bae7faf8
commit e5aaeef7b3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
deps/rabbitmq_shovel_management/src/rabbit_shovel_mgmt_shovel.erl vendored
View File

@ -45,17 +45,22 @@ resource_exists(ReqData, Context) ->
case name(ReqData) of case name(ReqData) of
none -> true; none -> true;
Name -> Name ->
%% Deleting or restarting a shovel
case get_shovel_node(VHost, Name, ReqData, Context) of case get_shovel_node(VHost, Name, ReqData, Context) of
undefined -> undefined ->
rabbit_log:error("Shovel with the name '~ts' was not found on virtual host '~ts'. " rabbit_log:error("Shovel with the name '~ts' was not found on virtual host '~ts'. "
"It may be failing to connect and report its status.", "It may be failing to connect and report its status.",
[Name, VHost]), [Name, VHost]),
case is_restart(ReqData) of case cowboy_req:method(ReqData) of
true -> false; <<"DELETE">> ->
%% this is a deletion attempt, it can continue and idempotently try to %% Deleting or restarting a shovel
%% delete the shovel case is_restart(ReqData) of
false -> true true -> false;
%% this is a deletion attempt, it can continue and idempotently try to
%% delete the shovel
false -> true
end;
_ ->
false
end; end;
_ -> _ ->
true true