Fix clickhouse buffer inserts

pull/65/head
Uku Taht 7 years ago
parent b76f5e728a
commit 3faec27c82

@ -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

@ -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

@ -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

@ -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

Loading…
Cancel
Save