hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#3059] Fixed Phoenix 1.5 telemetry processing.

Browse source
This commit is contained in:
Ivan Tashkinov 2020-10-22 13:54:15 +03:00
commit 8a55de1d78
4 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/pleroma/application.ex
View file

@ -151,7 +151,10 @@ defmodule Pleroma.Application do
Pleroma.Web.Endpoint.MetricsExporter.setup()
Pleroma.Web.Endpoint.PipelineInstrumenter.setup()
Pleroma.Web.Endpoint.Instrumenter.setup()
# Note: disabled until prometheus-phx is integrated into prometheus-phoenix:
# Pleroma.Web.Endpoint.Instrumenter.setup()
PrometheusPhx.setup()
end
defp cachex_children do

2
lib/pleroma/web/endpoint.ex
View file

@ -9,6 +9,8 @@ defmodule Pleroma.Web.Endpoint do
socket("/socket", Pleroma.Web.UserSocket)
plug Plug.Telemetry, event_prefix: [:phoenix, :endpoint]
plug(Pleroma.Web.Plugs.SetLocalePlug)
plug(CORSPlug)
plug(Pleroma.Web.Plugs.HTTPSecurityPlug)