Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

more salts logging (#5471)

ruslandoga0a2ed563dd0a
diff --git a/lib/plausible/session/salts.ex b/lib/plausible/session/salts.ex
index bdfc76ecb2..89bdf46a8a 100644
--- a/lib/plausible/session/salts.ex
+++ b/lib/plausible/session/salts.ex
@@ -9,6 +9,8 @@ defmodule Plausible.Session.Salts do
@impl true
def init(opts) do
+ Process.flag(:trap_exit, true)
+
name = opts[:name] || __MODULE__
now = opts[:now] || DateTime.utc_now()
clean_old_salts(now)
@@ -27,11 +29,9 @@ defmodule Plausible.Session.Salts do
state =
case salts do
[current, prev] ->
- Logger.warning("[salts] current salt hash: #{:erlang.phash2(current)}")
%{previous: prev, current: current}
[current] ->
- Logger.warning("[salts] current salt hash: #{:erlang.phash2(current)}")
%{previous: nil, current: current}
[] ->
@@ -39,6 +39,7 @@ defmodule Plausible.Session.Salts do
%{previous: nil, current: new}
end
+ log_state("init", state)
true = :ets.insert(name, {:state, state})
{:ok, name}
end
@@ -58,6 +59,7 @@ defmodule Plausible.Session.Salts do
previous: current
}
+ log_state("rotated", state)
true = :ets.insert(name, {:state, state})
{:reply, :ok, name}
end
@@ -70,7 +72,7 @@ defmodule Plausible.Session.Salts do
defp generate_and_persist_new_salt(now) do
salt = :crypto.strong_rand_bytes(16)
- Logger.warning("[salts] generated salt hash: #{:erlang.phash2(salt)}")
+ Logger.warning("[salts] generated #{:erlang.phash2(salt)}")
Repo.insert_all("salts", [%{salt: salt, inserted_at: now}])
salt
end
@@ -81,4 +83,17 @@ defmodule Plausible.Session.Salts do
Repo.delete_all(from s in "salts", where: s.inserted_at < ^h48_ago)
end
+
+ @impl true
+ def terminate(_reason, name) do
+ log_state("terminating", fetch(name))
+ end
+
+ defp log_state(stage, state) do
+ %{current: current, previous: previous} = state
+
+ Logger.warning(
+ "[salts] stage=#{stage} current=#{:erlang.phash2(current)} previous=#{:erlang.phash2(previous)}"
+ )
+ end
end