pleroma

commit: 653b14e1c798bbddc34821fa56f32fef9c227f01
parent 8efae57d67f327265176d21553ef57987fc540e8
Author: Mark Felder <feld@feld.me>
Date:   Sun, 21 Jan 2024 14:40:14 -0500

Use config to control Uploader callback timeout

Diffstat:
M
config/config.exs
2
++
M
config/test.exs
2
++
M
lib/pleroma/uploaders/uploader.ex
9
+--------

3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/config/config.exs b/config/config.exs
@@ -911,6 +911,8 @@ config :pleroma, Pleroma.Application,
   max_restarts: 3,
   streamer_registry: true
 
+config :pleroma, Pleroma.Uploaders.Uploader, timeout: 30_000
+
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
 import_config "#{Mix.env()}.exs"
diff --git a/config/test.exs b/config/test.exs
@@ -170,6 +170,8 @@ config :pleroma, Pleroma.Application,
   streamer_registry: false,
   test_http_pools: true
 
+config :pleroma, Pleroma.Uploaders.Uploader, timeout: 1_000
+
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"
 else
diff --git a/lib/pleroma/uploaders/uploader.ex b/lib/pleroma/uploaders/uploader.ex
@@ -5,8 +5,6 @@
 defmodule Pleroma.Uploaders.Uploader do
   import Pleroma.Web.Gettext
 
-  @mix_env Mix.env()
-
   @moduledoc """
   Defines the contract to put and get an uploaded file to any backend.
   """
@@ -75,10 +73,5 @@ defmodule Pleroma.Uploaders.Uploader do
     end
   end
 
-  defp callback_timeout do
-    case @mix_env do
-      :test -> 1_000
-      _ -> 30_000
-    end
-  end
+  defp callback_timeout, do: Application.get_env(:pleroma, __MODULE__)[:timeout]
 end