From: Mark Felder <feld@feld.me>
Date: Tue, 20 Apr 2021 17:00:02 +0000 (-0500)
Subject: OTP releases executing commands via pleroma_ctl show the parent of the process is... 
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=99fd9c5e38ad08973f435f1a67d6af60d004c578;p=akkoma

OTP releases executing commands via pleroma_ctl show the parent of the process is :erl_eval
---

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