changelog.md

@@ -1,8 +1,4 @@
-# 2022-06-13 - v0.4.1
+# 2022-04-20 - v0.4.0
-
-* Fix crash on failed SSHEx / Postgrex connection failure.
-
-# 2022-06-09 - v0.4.0
 
 * Add minimal clustering logic.
 * Fix crash on unavailable HAProxy socket.

lib/ha_handler/drbd/watcher.ex

@@ -28,23 +28,15 @@ defmodule HAHandler.DRBD.Watcher do
     hostname = Keyword.get(opts, :hostname)
     password = Keyword.get(opts, :password)
 
-    case connect(hostname, password) do
+    {:ok, pid} = connect(hostname, password)
-      {:ok, pid} ->
-        state = %{
-          backend: pid,
-          hostname: hostname,
-          password: password
-        }
 
-        {:ok, state}
+    state = %{
-      {:error, err} ->
+      backend: pid,
+      hostname: hostname,
+      password: password
+    }
 
-        # Wait for 10 seconds so that the supervisor does not loop on dead node
+    {:ok, state}
-        # (and reach the max_restart threshold / stop trying).
-        Process.sleep(10_000)
-
-        {:error, err}
-    end
   end
 
   @impl true

lib/ha_handler/pgsql/watcher.ex

@@ -12,19 +12,14 @@ defmodule HAHandler.PGSQL.Watcher do
     # successful.
     # TODO: set dbconnections backoff and connect hooks
     # See https://github.com/elixir-ecto/db_connection/blob/master/lib/db_connection.ex#L343
-    case Postgrex.start_link(opts) do
+    {:ok, pid} = Postgrex.start_link(opts)
-      {:ok, pid} ->
-        state = %{
-          backend: pid,
-          hostname: Keyword.get(opts, :hostname)
-        }
 
-        {:ok, state}
+    state = %{
-      {:error, err} ->
+      backend: pid,
-        # Will be catched by the supervisor if anything happen. It should not
+      hostname: Keyword.get(opts, :hostname)
-        # be triggered even if a PGSQL node down, since Postgrex has its own
+    }
-        # surpervision tree.
+
-        {:error, err}
+    {:ok, state}
   end
 
   @impl true

mix.exs

@@ -4,7 +4,7 @@ defmodule HAHandler.MixProject do
   def project do
     [
       app: :ha_handler,
-      version: "0.4.1",
+      version: "0.4.0",
       elixir: "~> 1.12",
       start_permanent: Mix.env() == :prod,
       deps: deps(),