Merge pull request #14022 from rabbitmq/mergify/bp/v4.1.x/pr-14019

Address review of PR #13996 (backport #14019)

Author: michaelklishin

deps/rabbitmq_mqtt/src/rabbit_mqtt_processor.erl

@@ -1995,7 +1995,7 @@ handle_down({{'DOWN', QName}, _MRef, process, QPid, Reason},
 -spec handle_queue_event(
         {queue_event, rabbit_amqqueue:name() | ?QUEUE_TYPE_QOS_0, term()}, state()) ->
     {ok, state()} | {error, Reason :: any(), state()}.
-handle_queue_event({queue_event, ?QUEUE_TYPE_QOS_0, {queue_down, QName}},
+handle_queue_event({queue_event, ?QUEUE_TYPE_QOS_0, {eol, QName}},
                    State0) ->
     try handle_queue_down(QName, State0) of
         State ->

deps/rabbitmq_mqtt/src/rabbit_mqtt_qos0_queue.erl

@@ -117,7 +117,7 @@ delete(Q, _IfUnused, _IfEmpty, ActingUser) ->
     case rabbit_amqqueue:internal_delete(Q, ActingUser) of
         ok ->
             Pid = amqqueue:get_pid(Q),
-            delegate:invoke_no_result([Pid], {gen_server, cast, [{queue_event, ?MODULE, {queue_down, QName}}]}),
+            gen_server:cast(Pid, {queue_event, ?MODULE, {eol, QName}}),
             {ok, 0};
         {error, timeout} = Err ->
             Err