summaryrefslogtreecommitdiff
path: root/lib/pleroma/application.ex
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2020-10-22 13:54:15 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2020-10-22 13:54:15 +0300
commit8a55de1d785178786b9ae7c185ea1d1f187f7470 (patch)
tree78a5345828a402ed04cb6def68364be912331cb8 /lib/pleroma/application.ex
parent9ea31b373fdb75bb6aa04d006e5f493158897efa (diff)
[#3059] Fixed Phoenix 1.5 telemetry processing.
Diffstat (limited to 'lib/pleroma/application.ex')
-rw-r--r--lib/pleroma/application.ex5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index d7e3a649f..51e9dda3b 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -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