darkkirb/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'fix/prometheus-ecto-error-when-not-configured' into 'develop'

Browse source 
Fix prometheus-ecto error when not configured

Closes #917

See merge request pleroma/pleroma!1180
This commit is contained in:
kaniini 2019-05-21 01:36:06 +00:00
commit 94caca924d
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/pleroma/application.ex
View file

@ -131,6 +131,7 @@ def start(_type, _args) do
defp setup_instrumenters do defp setup_instrumenters do
require Prometheus.Registry require Prometheus.Registry
if Application.get_env(:prometheus, Pleroma.Repo.Instrumenter) do
:ok = :ok =
:telemetry.attach( :telemetry.attach(
"prometheus-ecto", "prometheus-ecto",
@ -139,11 +140,13 @@ defp setup_instrumenters do
%{} %{}
) )
Pleroma.Repo.Instrumenter.setup()
end
Prometheus.Registry.register_collector(:prometheus_process_collector) Prometheus.Registry.register_collector(:prometheus_process_collector)
Pleroma.Web.Endpoint.MetricsExporter.setup() Pleroma.Web.Endpoint.MetricsExporter.setup()
Pleroma.Web.Endpoint.PipelineInstrumenter.setup() Pleroma.Web.Endpoint.PipelineInstrumenter.setup()
Pleroma.Web.Endpoint.Instrumenter.setup() Pleroma.Web.Endpoint.Instrumenter.setup()
Pleroma.Repo.Instrumenter.setup()
end end
def enabled_hackney_pools do def enabled_hackney_pools do