Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Broadcast consolidated view cache updates across the cluster (#5769)
Adam Rutkowski45659fd2a6c3
diff --git a/extra/lib/plausible/consolidated_view.ex b/extra/lib/plausible/consolidated_view.exindex 2a4365bf82..6af7c5a9af 100644--- a/extra/lib/plausible/consolidated_view.ex+++ b/extra/lib/plausible/consolidated_view.ex@@ -6,6 +6,7 @@ defmodule Plausible.ConsolidatedView do"""use Plausible+ alias Plausible.ConsolidatedViewimport Ecto.Query@@ -105,10 +106,15 @@ defmodule Plausible.ConsolidatedView dodefp do_enable(%Team{} = team) docase get(team) donil ->- team- |> Site.new_for_team(%{consolidated: true, domain: make_id(team)})- |> change_stats_dates(team)- |> Repo.insert()+ {:ok, consolidated_view} =+ team+ |> Site.new_for_team(%{consolidated: true, domain: make_id(team)})+ |> change_stats_dates(team)+ |> Repo.insert()++ {:ok, site_ids} = site_ids(team)+ :ok = ConsolidatedView.Cache.broadcast_put(consolidated_view.domain, site_ids)+ {:ok, consolidated_view}consolidated_view ->{:ok, consolidated_view}diff --git a/lib/plausible/cache.ex b/lib/plausible/cache.exindex 8d2979acde..969909d0e3 100644--- a/lib/plausible/cache.ex+++ b/lib/plausible/cache.ex@@ -64,6 +64,19 @@ defmodule Plausible.Cache doalias Plausible.Cache.Adapterrequire Logger+ @spec broadcast_put(any(), Keyword.t()) :: :ok+ def broadcast_put(key, value, opts \\ []) do+ cache_name = Keyword.get(opts, :cache_name, name())+ multicall_timeout = Keyword.get(opts, :multicall_timeout, :timer.seconds(5))++ {:ok, _} =+ Task.start(fn ->+ :rpc.multicall(Adapter, :put, [cache_name, key, value, opts], multicall_timeout)+ end)++ :ok+ end+@spec get(any(), Keyword.t()) :: any() | nildef get(key, opts \\ []) when is_list(opts) docache_name = Keyword.get(opts, :cache_name, name())diff --git a/test/plausible/cache_test.exs b/test/plausible/cache_test.exsindex 3356208bbf..b8c62be294 100644--- a/test/plausible/cache_test.exs+++ b/test/plausible/cache_test.exs@@ -115,6 +115,15 @@ defmodule Plausible.CacheTest doassert :changed == ExampleCache.get("item1", cache_name: test, force?: true)assert :item2 == ExampleCache.get("item2", cache_name: test, force?: true)end++ test "broadcast_put puts into local cache", %{test: test} do+ {:ok, _} = start_test_cache(test)+ :ok = ExampleCache.broadcast_put("item1", :item1, cache_name: test)++ assert eventually(fn ->+ {ExampleCache.get("item1", cache_name: test, force?: true) == :item1, :ok}+ end)+ endenddescribe "warming the cache" dodiff --git a/test/plausible/consolidated_view_test.exs b/test/plausible/consolidated_view_test.exsindex 203c576116..9e9f644554 100644--- a/test/plausible/consolidated_view_test.exs+++ b/test/plausible/consolidated_view_test.exs@@ -51,6 +51,15 @@ defmodule Plausible.ConsolidatedViewTest doassert view.native_stats_start_at == minassert view.stats_start_date == NaiveDateTime.to_date(min)end++ test "enable/1 updates cache", %{team: team} do+ site = new_site(team: team)+ {:ok, _} = ConsolidatedView.enable(team)++ assert eventually(fn ->+ {ConsolidatedView.Cache.get(team.identifier) == [site.id], :ok}+ end)+ endenddescribe "disable/1" do