diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-09-02 13:46:11 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-09-02 13:46:11 +0000 |
| commit | d6e979aebe7d837aea8bf80323b937eab87e096d (patch) | |
| tree | 32f0c3901f9d4ca3df1c76f79d31052d450b6858 /config | |
| parent | 47ff425cfd53212aba26e9eba86de16e3ef1442b (diff) | |
| parent | d48fc90978eee46c8fba00a80082d14fc31a0eec (diff) | |
| download | pleroma-d6e979aebe7d837aea8bf80323b937eab87e096d.tar.gz pleroma-d6e979aebe7d837aea8bf80323b937eab87e096d.zip | |
Merge branch 'feat/rich-media-improvements' into 'develop'
Rich media improvements
See merge request pleroma/pleroma!2944
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 1 | ||||
| -rw-r--r-- | config/description.exs | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index ea8869d48..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, 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] } ] }, |