Resolve a conflict

rabbitmq · Oct 3, 2022 · 04e6f19 · 04e6f19
1 parent bb44082
commit 04e6f19
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 31 deletions.
diff --git a/deps/rabbitmq_stream/src/rabbit_stream.erl b/deps/rabbitmq_stream/src/rabbit_stream.erl
@@ -207,12 +207,7 @@ emit_publisher_info_local(VHost, Items, Ref, AggregatorPid) ->
 
 list(VHost) ->
     [Client
-<<<<<<< HEAD
-     || {_, ListSup, _, _}
-            <- supervisor2:which_children(rabbit_stream_sup),
-=======
-     || {_, ListSup, _, _} <- supervisor:which_children(rabbit_stream_sup),
->>>>>>> 0c1eeab92b (Fix keys for route and partitions responses)
+     || {_, ListSup, _, _} <- supervisor2:which_children(rabbit_stream_sup),
         {_, RanchEmbeddedSup, supervisor, _}
             <- supervisor2:which_children(ListSup),
         {{ranch_listener_sup, _}, RanchListSup, _, _}

diff --git a/deps/rabbitmq_stream/src/rabbit_stream_connection_sup.erl b/deps/rabbitmq_stream/src/rabbit_stream_connection_sup.erl
@@ -28,26 +28,7 @@
 start_link(Ref, Transport, Opts) ->
     {ok, SupPid} = supervisor2:start_link(?MODULE, []),
     {ok, KeepaliveSup} =
-<<<<<<< HEAD
         supervisor2:start_child(SupPid,
-                                {rabbit_stream_keepalive_sup,
-                                 {rabbit_stream_connection_sup,
-                                  start_keepalive_link, []},
-                                 intrinsic,
-                                 infinity,
-                                 supervisor,
-                                 [rabbit_keepalive_sup]}),
-    {ok, ReaderPid} =
-        supervisor2:start_child(SupPid,
-                                {rabbit_stream_reader,
-                                 {rabbit_stream_reader, start_link,
-                                  [KeepaliveSup, Transport, Ref, Opts]},
-                                 intrinsic,
-                                 ?WORKER_WAIT,
-                                 worker,
-                                 [rabbit_stream_reader]}),
-=======
-        supervisor:start_child(SupPid,
                                #{id => rabbit_stream_keepalive_sup,
                                  start =>
                                      {rabbit_stream_connection_sup,
@@ -58,7 +39,7 @@ start_link(Ref, Transport, Opts) ->
                                  type => supervisor,
                                  modules => [rabbit_keepalive_sup]}),
     {ok, ReaderPid} =
-        supervisor:start_child(SupPid,
+        supervisor2:start_child(SupPid,
                                #{id => rabbit_stream_reader,
                                  start =>
                                      {rabbit_stream_reader, start_link,
@@ -68,7 +49,6 @@ start_link(Ref, Transport, Opts) ->
                                  shutdown => ?WORKER_WAIT,
                                  type => worker,
                                  modules => [rabbit_stream_reader]}),
->>>>>>> 0c1eeab92b (Fix keys for route and partitions responses)
     {ok, SupPid, ReaderPid}.
 
 start_keepalive_link() ->
@@ -77,13 +57,9 @@ start_keepalive_link() ->
 %%----------------------------------------------------------------------------
 
 init([]) ->
-<<<<<<< HEAD
-    {ok, {{one_for_all, 0, 1}, []}}.
-=======
     {ok,
      {#{strategy => one_for_all,
         intensity => 0,
         period => 1,
         auto_shutdown => any_significant},
       []}}.
->>>>>>> 0c1eeab92b (Fix keys for route and partitions responses)