Fix sessions bug (#496)

* Add sitekey to captcha

* Remove appsignal decorators

* Fix session write buffer
pull/500/head
Uku Taht 6 years ago committed by GitHub
parent 46e20b204c
commit 5dcb329744
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1,7 +1,6 @@
defmodule Plausible.Session.Store do
use GenServer
use Plausible.Repo
use Appsignal.Instrumentation.Decorators
alias Plausible.Session.WriteBuffer
import Ecto.Query, only: [from: 2]
require Logger
@ -42,7 +41,6 @@ defmodule Plausible.Session.Store do
{:ok, %{timer: timer, sessions: sessions}}
end
@decorate transaction_event("phoenix_controller")
def on_event(event, prev_user_id) do
GenServer.call(__MODULE__, {:on_event, event, prev_user_id})
end

@ -51,7 +51,10 @@ defmodule Plausible.Session.WriteBuffer do
sessions ->
Logger.info("Flushing #{length(sessions)} sessions")
sessions = Enum.map(sessions, &(Map.from_struct(&1) |> Map.delete(:__meta__)))
sessions = sessions
|> Enum.map(&(Map.from_struct(&1) |> Map.delete(:__meta__)))
|> Enum.reverse
Plausible.ClickhouseRepo.insert_all(Plausible.ClickhouseSession, sessions)
end
end

@ -1,6 +1,5 @@
defmodule PlausibleWeb.Api.ExternalController do
use PlausibleWeb, :controller
use Appsignal.Instrumentation.Decorators
require Logger
def event(conn, _params) do
@ -55,7 +54,6 @@ defmodule PlausibleWeb.Api.ExternalController do
})
end
@decorate transaction_event("phoenix_controller")
defp parse_user_agent(conn) do
user_agent = Plug.Conn.get_req_header(conn, "user-agent") |> List.first()
user_agent && UAInspector.parse(user_agent)
@ -162,7 +160,6 @@ defmodule PlausibleWeb.Api.ExternalController do
@decorate transaction_event("phoenix_controller")
defp parse_referrer(_, nil), do: nil
defp parse_referrer(uri, referrer_str) do
referrer_uri = URI.parse(referrer_str)

@ -45,7 +45,7 @@
<%= if PlausibleWeb.Captcha.enabled?() do %>
<div class="mt-4">
<div class="h-captcha"></div>
<div class="h-captcha" data-sitekey="<%= PlausibleWeb.Captcha.sitekey() %>"></div>
<%= if assigns[:captcha_error] do %>
<div class="text-red-500 text-xs italic mt-3"><%= @captcha_error %></div>
<% end %>

Loading…
Cancel
Save