aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/application.ex
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2018-05-26 16:00:59 +0200
committerlain <lain@soykaf.club>2018-05-26 16:00:59 +0200
commit4b3ec5351466f8615b32e62cc4e6215f8a80b105 (patch)
treee46842eac5d8255858a113f71bdf42bfd75e4436 /lib/pleroma/application.ex
parent4fd9df100f61dfe4731934eca86500472d866f60 (diff)
parent6138b297836f459e4fe5d21dfed30ddd9397b6d4 (diff)
downloadpleroma-4b3ec5351466f8615b32e62cc4e6215f8a80b105.tar.gz
Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api
Diffstat (limited to 'lib/pleroma/application.ex')
-rw-r--r--lib/pleroma/application.ex8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/pleroma/application.ex b/lib/pleroma/application.ex
index e1e3bcd63..a89728471 100644
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@@ -5,6 +5,7 @@ defmodule Pleroma.Application do
# for more information on OTP Applications
def start(_type, _args) do
import Supervisor.Spec
+ import Cachex.Spec
# Define workers and child supervisors to be supervised
children =
@@ -28,8 +29,11 @@ defmodule Pleroma.Application do
[
:idempotency_cache,
[
- default_ttl: :timer.seconds(6 * 60 * 60),
- ttl_interval: :timer.seconds(60),
+ expiration:
+ expiration(
+ default: :timer.seconds(6 * 60 * 60),
+ interval: :timer.seconds(60)
+ ),
limit: 2500
]
],