diff options
author | Mark Felder <feld@feld.me> | 2024-01-21 14:40:14 -0500 |
---|---|---|
committer | Mark Felder <feld@feld.me> | 2024-01-22 18:37:13 -0500 |
commit | 653b14e1c798bbddc34821fa56f32fef9c227f01 (patch) | |
tree | 97fa9794d6e0de71f2d30092e0c52a7235bbc426 /lib | |
parent | 8efae57d67f327265176d21553ef57987fc540e8 (diff) | |
download | pleroma-653b14e1c798bbddc34821fa56f32fef9c227f01.tar.gz pleroma-653b14e1c798bbddc34821fa56f32fef9c227f01.zip |
Use config to control Uploader callback timeout
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/uploaders/uploader.ex | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/lib/pleroma/uploaders/uploader.ex b/lib/pleroma/uploaders/uploader.ex index 23caaff1a..3396fe06a 100644 --- 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 |