diff options
| author | lain <lain@soykaf.club> | 2020-09-03 11:29:39 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-09-03 11:29:39 +0200 |
| commit | f26b580e80e57f162442e6f0c3bc0072cb935ce3 (patch) | |
| tree | 3aad914a705da3574c3924c7dc6915965c2e3ad7 /config | |
| parent | 0a9c63fb4351ed29a521697f2c584b0ae007696c (diff) | |
| parent | d1a6f67b1d92e17f4fe3cfc8f296879326897220 (diff) | |
| download | pleroma-f26b580e80e57f162442e6f0c3bc0072cb935ce3.tar.gz pleroma-f26b580e80e57f162442e6f0c3bc0072cb935ce3.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into seanking/pleroma-fix_install_fe_bug
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 13 | ||||
| -rw-r--r-- | config/description.exs | 7 |
2 files changed, 16 insertions, 4 deletions
diff --git a/config/config.exs b/config/config.exs index 246712b9f..ed37b93c0 100644 --- a/config/config.exs +++ b/config/config.exs @@ -412,6 +412,7 @@ config :pleroma, :rich_media, Pleroma.Web.RichMedia.Parsers.TwitterCard, Pleroma.Web.RichMedia.Parsers.OEmbed ], + failure_backoff: 60_000, ttl_setters: [Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl] config :pleroma, :media_proxy, @@ -740,19 +741,23 @@ config :pleroma, :connections_pool, config :pleroma, :pools, federation: [ size: 50, - max_waiting: 10 + max_waiting: 10, + timeout: 10_000 ], media: [ size: 50, - max_waiting: 10 + max_waiting: 10, + timeout: 10_000 ], upload: [ size: 25, - max_waiting: 5 + max_waiting: 5, + timeout: 15_000 ], default: [ size: 10, - max_waiting: 2 + max_waiting: 2, + timeout: 5_000 ] config :pleroma, :hackney_pools, diff --git a/config/description.exs b/config/description.exs index 29a657333..5e08ba109 100644 --- a/config/description.exs +++ b/config/description.exs @@ -2385,6 +2385,13 @@ config :pleroma, :config_description, [ suggestions: [ Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl ] + }, + %{ + key: :failure_backoff, + type: :integer, + description: + "Amount of milliseconds after request failure, during which the request will not be retried.", + suggestions: [60_000] } ] }, |