make reapeer stop properly if failing

testcontainers · Oct 13, 2023 · 682b39e · 682b39e
1 parent d97df0b
commit 682b39e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/lib/connection.ex b/lib/connection.ex
@@ -6,7 +6,7 @@ defmodule TestcontainersElixir.Connection do
   @api_version "v1.41"
 
   def get_connection do
-    Connection.new(base_url: docker_base_url() |> IO.inspect())
+    Connection.new(base_url: docker_base_url())
   end
 
   defp docker_base_url do

diff --git a/lib/containers.ex b/lib/containers.ex
@@ -24,7 +24,7 @@ defmodule TestcontainersElixir.Containers do
          container_id = container."Id",
          {:ok, _} <- Api.Container.container_start(conn, container_id),
          :ok <- on_exit.(:stop_container, fn -> stop_container(conn, container_id) end),
-         :ok <- reap_container(conn, container_id),
+         :ok <- reap_container(container_id),
          {:ok, container} <- get_container(conn, container_id),
          {:ok, _} <- waiting_strategy.(conn, container) do
       {:ok, container}
@@ -44,8 +44,8 @@ defmodule TestcontainersElixir.Containers do
     end
   end
 
-  defp reap_container(conn, container_id) when is_binary(container_id) do
-    case conn |> Reaper.start_link() do
+  defp reap_container(container_id) when is_binary(container_id) do
+    case Reaper.start_link() do
       {:error, {:already_started, _}} -> :ok
       {:ok, _} -> :ok
     end

diff --git a/lib/reaper.ex b/lib/reaper.ex
@@ -2,24 +2,25 @@
 defmodule TestcontainersElixir.Reaper do
   use GenServer
 
+  alias TestcontainersElixir.Connection
   alias DockerEngineAPI.Api
   alias DockerEngineAPI.Model
   alias TestcontainersElixir.Container
 
   @ryuk_image "testcontainers/ryuk:0.5.1"
   @ryuk_port 8080
 
-  def start_link(connection) do
-    GenServer.start_link(__MODULE__, connection, name: __MODULE__)
+  def start_link() do
+    GenServer.start_link(__MODULE__, nil, name: __MODULE__)
   end
 
   def register(filter) do
     GenServer.call(__MODULE__, {:register, filter})
   end
 
   @impl true
-  def init(connection) do
-    Process.flag(:trap_exit, true)
+  def init(_) do
+    connection = Connection.get_connection()
 
     with {:ok, _image_create_response} <-
            Api.Image.image_create(connection, fromImage: @ryuk_image),
@@ -32,6 +33,8 @@ defmodule TestcontainersElixir.Reaper do
          container = Container.of(container_info),
          {:ok, socket} <- create_ryuk_socket(container) do
       {:ok, socket}
+    else error ->
+      {:stop, "Failed to start reaper: #{inspect(error)}"}
     end
   end