Keep StartMode argument for mixed-version compatibility

rabbitmq · Jun 3, 2024 · c95d318 · c95d318
1 parent 1bb7c47
commit c95d318
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/deps/rabbit/src/rabbit_amqqueue_sup.erl b/deps/rabbit/src/rabbit_amqqueue_sup.erl
@@ -9,18 +9,18 @@
 
 -behaviour(supervisor).
 
--export([start_link/1]).
+-export([start_link/2]).
 
 -export([init/1]).
 
 -include_lib("rabbit_common/include/rabbit.hrl").
 
 %%----------------------------------------------------------------------------
 
--spec start_link(amqqueue:amqqueue()) ->
+-spec start_link(amqqueue:amqqueue(), any()) ->
           {'ok', pid(), pid()}.
 
-start_link(Q) ->
+start_link(Q, _StartMode) ->
     Marker = spawn_link(fun() -> receive stop -> ok end end),
     StartMFA = {rabbit_amqqueue_process, start_link, [Q, Marker]},
     ChildSpec = #{id => rabbit_amqqueue,

diff --git a/deps/rabbit/src/rabbit_amqqueue_sup_sup.erl b/deps/rabbit/src/rabbit_amqqueue_sup_sup.erl
@@ -32,7 +32,7 @@ start_link() ->
 start_queue_process(Node, Q) ->
     #resource{virtual_host = VHost} = amqqueue:get_name(Q),
     {ok, Sup} = find_for_vhost(VHost, Node),
-    {ok, _SupPid, QPid} = supervisor:start_child(Sup, [Q]),
+    {ok, _SupPid, QPid} = supervisor:start_child(Sup, [Q, declare]),
     QPid.
 
 init([]) ->