X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Futils.ex;h=bd9939c9fa9fe9b8f0625052c728ea69a5829dcf;hb=a079ec3a3cdfd42d2cbd51c7698c2c87828e5778;hp=55aecc509f903fd82f0da85c45e4a1be86818f13;hpb=99fd9c5e38ad08973f435f1a67d6af60d004c578;p=akkoma

diff --git a/lib/pleroma/utils.ex b/lib/pleroma/utils.ex
index 55aecc509..bd9939c9f 100644
--- a/lib/pleroma/utils.ex
+++ b/lib/pleroma/utils.ex
@@ -11,11 +11,26 @@ defmodule Pleroma.Utils do
     eperm epipe erange erofs espipe esrch estale etxtbsy exdev
   )a
 
+  @repo_timeout Pleroma.Config.get([Pleroma.Repo, :timeout], 15_000)
+
   def compile_dir(dir) when is_binary(dir) do
+    dir
+    |> elixir_files()
+    |> Kernel.ParallelCompiler.compile()
+  end
+
+  defp elixir_files(dir) when is_binary(dir) do
     dir
     |> File.ls!()
     |> Enum.map(&Path.join(dir, &1))
-    |> Kernel.ParallelCompiler.compile()
+    |> Enum.flat_map(fn path ->
+      if File.dir?(path) do
+        elixir_files(path)
+      else
+        [path]
+      end
+    end)
+    |> Enum.filter(fn path -> String.ends_with?(path, ".ex") end)
   end
 
   @doc """
@@ -64,13 +79,20 @@ defmodule Pleroma.Utils do
 
   def posix_error_message(_), do: ""
 
+  @doc """
+  Returns [timeout: integer] suitable for passing as an option to Repo functions.
+
+  This function detects if the execution was triggered from IEx shell, Mix task, or
+  ./bin/pleroma_ctl and sets the timeout to :infinity, else returns the default timeout value.
+  """
+  @spec query_timeout() :: [timeout: integer]
   def query_timeout do
     {parent, _, _, _} = Process.info(self(), :current_stacktrace) |> elem(1) |> Enum.fetch!(2)
 
     cond do
       parent |> to_string |> String.starts_with?("Elixir.Mix.Task") -> [timeout: :infinity]
       parent == :erl_eval -> [timeout: :infinity]
-      true -> [timeout: 15_000]
+      true -> [timeout: @repo_timeout]
     end
   end
 end