X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fpleroma%2Ftelemetry%2Flogger.ex;h=35e245237ec5abf5004b890df5e273eddd1ac247;hb=de7f84deb3ebe57744630950860f8fbf64a414a2;hp=c079f34f2657150eb28e0918bc5d339cbe6d2c0b;hpb=e009950845c6d1e7864bb68ea1258c58438ee3aa;p=akkoma

diff --git a/lib/pleroma/telemetry/logger.ex b/lib/pleroma/telemetry/logger.ex
index c079f34f2..35e245237 100644
--- a/lib/pleroma/telemetry/logger.ex
+++ b/lib/pleroma/telemetry/logger.ex
@@ -35,9 +35,7 @@ defmodule Pleroma.Telemetry.Logger do
         _
       ) do
     Logger.debug(fn ->
-      "Connection pool is exhausted (reached #{max_connections} connections). Starting idle connection cleanup to reclaim as much as #{
-        reclaim_max
-      } connections"
+      "Connection pool is exhausted (reached #{max_connections} connections). Starting idle connection cleanup to reclaim as much as #{reclaim_max} connections"
     end)
   end
 
@@ -79,9 +77,7 @@ defmodule Pleroma.Telemetry.Logger do
         _
       ) do
     Logger.warn(fn ->
-      "Pool worker for #{key}: Client #{inspect(client_pid)} died before releasing the connection with #{
-        inspect(reason)
-      }"
+      "Pool worker for #{key}: Client #{inspect(client_pid)} died before releasing the connection with #{inspect(reason)}"
     end)
   end
 
@@ -100,19 +96,36 @@ defmodule Pleroma.Telemetry.Logger do
 
   def handle_event(
         [:pleroma, :repo, :query] = _name,
-        %{query_time: query_time} = _measurements,
-        %{source: source, query: query, params: query_params, repo: repo} = _metadata,
-        _config
-      )
-      when query_time > 500_000 and source not in [nil, "oban_jobs"] do
-    {:current_stacktrace, stacktrace} = Process.info(self(), :current_stacktrace)
+        %{query_time: query_time} = measurements,
+        %{source: source} = metadata,
+        config
+      ) do
+    logging_config = Pleroma.Config.get([:telemetry, :slow_queries_logging], [])
+
+    if logging_config[:enabled] &&
+         logging_config[:min_duration] &&
+         query_time > logging_config[:min_duration] and
+         (is_nil(logging_config[:exclude_sources]) or
+            source not in logging_config[:exclude_sources]) do
+      log_slow_query(measurements, metadata, config)
+    else
+      :ok
+    end
+  end
 
+  defp log_slow_query(
+         %{query_time: query_time} = _measurements,
+         %{source: _source, query: query, params: query_params, repo: repo} = _metadata,
+         _config
+       ) do
     sql_explain =
       with {:ok, %{rows: explain_result_rows}} <-
              repo.query("EXPLAIN " <> query, query_params, log: false) do
         Enum.map_join(explain_result_rows, "\n", & &1)
       end
 
+    {:current_stacktrace, stacktrace} = Process.info(self(), :current_stacktrace)
+
     pleroma_stacktrace =
       Enum.filter(stacktrace, fn
         {__MODULE__, _, _, _} ->
@@ -128,11 +141,11 @@ defmodule Pleroma.Telemetry.Logger do
       """
       Slow query!
 
-      Total time: #{query_time / 1_000}ms
+      Total time: #{round(query_time / 1_000)} ms
 
       #{query}
 
-      #{inspect(query_params)}
+      #{inspect(query_params, limit: :infinity)}
 
       #{sql_explain}
 
@@ -140,6 +153,4 @@ defmodule Pleroma.Telemetry.Logger do
       """
     end)
   end
-
-  def handle_event([:pleroma, :repo, :query], _measurements, _metadata, _config), do: :ok
 end