summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Felder <feld@feld.me>2021-04-20 12:00:02 -0500
committerMark Felder <feld@feld.me>2021-04-22 10:15:50 -0500
commit99fd9c5e38ad08973f435f1a67d6af60d004c578 (patch)
treeb133061b6a53dfe08099df8a8f2a049f98fb8664
parent9f711ddcf84bdb5a5680e1b55afa83768014906d (diff)
OTP releases executing commands via pleroma_ctl show the parent of the process is :erl_eval
-rw-r--r--lib/pleroma/utils.ex1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/utils.ex b/lib/pleroma/utils.ex
index 5e2fa8bf7..55aecc509 100644
--- a/lib/pleroma/utils.ex
+++ b/lib/pleroma/utils.ex
@@ -69,6 +69,7 @@ defmodule Pleroma.Utils do
cond do
parent |> to_string |> String.starts_with?("Elixir.Mix.Task") -> [timeout: :infinity]
+ parent == :erl_eval -> [timeout: :infinity]
true -> [timeout: 15_000]
end
end