From 3faec27c8202fc33fc6574949d1ea26152f00b08 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Thu, 7 May 2020 14:53:06 +0300 Subject: [PATCH] Fix clickhouse buffer inserts --- lib/plausible/event/write_buffer.ex | 2 +- lib/plausible/ingest/fingerprint_session.ex | 5 ++++- lib/plausible/session/write_buffer.ex | 2 +- lib/plausible_web/controllers/api/external_controller.ex | 7 +++++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/lib/plausible/event/write_buffer.ex b/lib/plausible/event/write_buffer.ex index 6efab4f7c..12c995dcb 100644 --- a/lib/plausible/event/write_buffer.ex +++ b/lib/plausible/event/write_buffer.ex @@ -56,6 +56,6 @@ defmodule Plausible.Event.WriteBuffer do [event.name, event.timestamp, event.domain, event.fingerprint, event.hostname, event.pathname, event.referrer, event.referrer_source, event.initial_referrer, event.initial_referrer_source, event.country_code, event.screen_size, event.browser, event.operating_system] ++ acc end) - Clickhousex.query(:clickhouse, insert, args, log: {Plausible.Stats, :log, []}) + Clickhousex.query(:clickhouse, insert, args, log: {Plausible.Clickhouse, :log, []}) end end diff --git a/lib/plausible/ingest/fingerprint_session.ex b/lib/plausible/ingest/fingerprint_session.ex index 09cfcb6a6..8ef204e8d 100644 --- a/lib/plausible/ingest/fingerprint_session.ex +++ b/lib/plausible/ingest/fingerprint_session.ex @@ -62,7 +62,10 @@ defmodule Plausible.Ingest.FingerprintSession do start: first_event.timestamp }) - if changeset.valid? && changeset.data.domain in ["plausible.io", "localtest.me"], do: Plausible.Session.WriteBuffer.insert(changeset.data) + if changeset.valid? && changeset.changes[:domain] in ["plausible.io", "localtest.me"] do + Ecto.Changeset.apply_action!(changeset, :insert) + |> Plausible.Session.WriteBuffer.insert() + end Repo.insert!(changeset) end diff --git a/lib/plausible/session/write_buffer.ex b/lib/plausible/session/write_buffer.ex index c084c7aca..bd34b4241 100644 --- a/lib/plausible/session/write_buffer.ex +++ b/lib/plausible/session/write_buffer.ex @@ -56,6 +56,6 @@ defmodule Plausible.Session.WriteBuffer do [session.domain, session.fingerprint, session.hostname, session.start, session.is_bounce && 1 || 0, session.entry_page, session.exit_page, session.referrer, session.referrer_source,session.country_code, session.screen_size, session.browser, session.operating_system] ++ acc end) - Clickhousex.query(:clickhouse, insert, args, log: {Plausible.Stats, :log, []}) + Clickhousex.query(:clickhouse, insert, args, log: {Plausible.Clickhouse, :log, []}) end end diff --git a/lib/plausible_web/controllers/api/external_controller.ex b/lib/plausible_web/controllers/api/external_controller.ex index 717575cae..e6bd76d23 100644 --- a/lib/plausible_web/controllers/api/external_controller.ex +++ b/lib/plausible_web/controllers/api/external_controller.ex @@ -48,7 +48,6 @@ defmodule PlausibleWeb.Api.ExternalController do event_attrs = %{ name: params["name"], - timestamp: NaiveDateTime.utc_now(), hostname: strip_www(uri && uri.host), domain: strip_www(params["domain"]) || strip_www(uri && uri.host), pathname: uri && escape_quote(uri.path), @@ -64,7 +63,11 @@ defmodule PlausibleWeb.Api.ExternalController do } changeset = Plausible.Event.changeset(%Plausible.Event{}, event_attrs) - if changeset.valid? && changeset.data.domain in ["plausible.io", "localtest.me"], do: Plausible.Event.WriteBuffer.insert(changeset.data) + if changeset.valid? && changeset.changes[:domain] in ["plausible.io", "localtest.me"] do + Ecto.Changeset.apply_action!(changeset, :insert) + |> Map.put(:timestamp, NaiveDateTime.utc_now()) + |> Plausible.Event.WriteBuffer.insert() + end Plausible.Repo.insert(changeset) end end