diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-09-03 10:34:06 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-09-03 10:34:06 -0500 |
| commit | 85446cc30c97a326d90b4ef719ba2e54c2ad423f (patch) | |
| tree | caa8e1268cbab2a09e414b85d2ce52b24249d0da /config | |
| parent | 6ce28c409137972ee9b105b9d7ab4a0fd2a0d08b (diff) | |
| parent | 9433311923d4b41b057ce6cb1632ff27d46919b4 (diff) | |
| download | pleroma-85446cc30c97a326d90b4ef719ba2e54c2ad423f.tar.gz | |
Merge branch 'develop' into media-preview-proxy
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 972b96d2d..317ef84a9 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, @@ -752,19 +753,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 60f76be45..868b89d29 100644 --- a/config/description.exs +++ b/config/description.exs @@ -2441,6 +2441,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] } ] }, |