pleroma

commit: 94caca924d94b8d976f4f362515e0d4eb7b9d4fb
parent: d4847b17ca0d0c5acf8344d06e11062b2d7ab37e
Author: kaniini <nenolod@gmail.com>
Date:   Tue, 21 May 2019 01:36:06 +0000

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

Fix prometheus-ecto error when not configured

Closes #917

See merge request pleroma/pleroma!1180
Diffstat:
M
lib/pleroma/application.ex
19
+++++++++++--------

1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
@@ -131,19 +131,22 @@ defmodule Pleroma.Application do
   defp setup_instrumenters do
     require Prometheus.Registry
 
-    :ok =
-      :telemetry.attach(
-        "prometheus-ecto",
-        [:pleroma, :repo, :query],
-        &Pleroma.Repo.Instrumenter.handle_event/4,
-        %{}
-      )
+    if Application.get_env(:prometheus, Pleroma.Repo.Instrumenter) do
+      :ok =
+        :telemetry.attach(
+          "prometheus-ecto",
+          [:pleroma, :repo, :query],
+          &Pleroma.Repo.Instrumenter.handle_event/4,
+          %{}
+        )
+
+      Pleroma.Repo.Instrumenter.setup()
+    end
 
     Prometheus.Registry.register_collector(:prometheus_process_collector)
     Pleroma.Web.Endpoint.MetricsExporter.setup()
     Pleroma.Web.Endpoint.PipelineInstrumenter.setup()
     Pleroma.Web.Endpoint.Instrumenter.setup()
-    Pleroma.Repo.Instrumenter.setup()
   end
 
   def enabled_hackney_pools do