From 653b14e1c798bbddc34821fa56f32fef9c227f01 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Sun, 21 Jan 2024 14:40:14 -0500
Subject: Use config to control Uploader callback timeout

---
 config/config.exs | 2 ++
 config/test.exs   | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 7ff3aaa22..bb17ab145 100644
--- 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
index 28d0364c6..40e93705d 100644
--- 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
-- 
cgit v1.2.3