projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
OTP releases executing commands via pleroma_ctl show the parent of the process is...
[akkoma]
/
lib
/
pleroma
/
utils.ex
diff --git
a/lib/pleroma/utils.ex
b/lib/pleroma/utils.ex
index 5e2fa8bf7d27d1b88783e602e9057aba4ffeaedb..55aecc509f903fd82f0da85c45e4a1be86818f13 100644
(file)
--- 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