hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use config to control Uploader callback timeout

Browse source
This commit is contained in:
Mark Felder 2024-01-21 14:40:14 -05:00
commit 653b14e1c7
3 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/config.exs
View file

@ -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"

2
config/test.exs
View file

@ -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