diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-01-13 13:38:28 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-01-13 13:38:28 +0300 |
| commit | e4dc3f71aea900e566c0d66ddffc5cd57e3920dd (patch) | |
| tree | d0b0edfd3c7aa4c2015b0b461a4c40895e16eba9 /lib/pleroma/application.ex | |
| parent | 9a6236e69d2709c0df374574fd77c4b2bc3d68fb (diff) | |
| parent | 19b6a8239387869c69c6885044ee488d097b723f (diff) | |
| download | pleroma-e4dc3f71aea900e566c0d66ddffc5cd57e3920dd.tar.gz | |
Resolve merge conflict
Diffstat (limited to 'lib/pleroma/application.ex')
| -rw-r--r-- | lib/pleroma/application.ex | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex index e15991957..ad2797209 100644 --- a/lib/pleroma/application.ex +++ b/lib/pleroma/application.ex @@ -1,3 +1,7 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/> +# SPDX-License-Identifier: AGPL-3.0-only + defmodule Pleroma.Application do use Application import Supervisor.Spec @@ -28,6 +32,16 @@ defmodule Pleroma.Application do worker( Cachex, [ + :used_captcha_cache, + [ + ttl_interval: :timer.seconds(Pleroma.Config.get!([Pleroma.Captcha, :seconds_valid])) + ] + ], + id: :cachex_used_captcha_cache + ), + worker( + Cachex, + [ :user_cache, [ default_ttl: 25000, @@ -52,6 +66,27 @@ defmodule Pleroma.Application do worker( Cachex, [ + :rich_media_cache, + [ + default_ttl: :timer.minutes(120), + limit: 5000 + ] + ], + id: :cachex_rich_media + ), + worker( + Cachex, + [ + :scrubber_cache, + [ + limit: 2500 + ] + ], + id: :cachex_scrubber + ), + worker( + Cachex, + [ :idempotency_cache, [ expiration: |