projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bugfix/wrong-date-format' into 'develop'
[akkoma]
/
lib
/
pleroma
/
application.ex
diff --git
a/lib/pleroma/application.ex
b/lib/pleroma/application.ex
index 8756e946939a551541ca6f415322f32cd895133d..782d1d58997709635bb51099e8a6e6c982e869b4 100644
(file)
--- a/
lib/pleroma/application.ex
+++ b/
lib/pleroma/application.ex
@@
-48,7
+48,7
@@
defmodule Pleroma.Application do
[
:user_cache,
[
[
:user_cache,
[
- default_ttl: 25000,
+ default_ttl: 25
_
000,
ttl_interval: 1000,
limit: 2500
]
ttl_interval: 1000,
limit: 2500
]
@@
-60,7
+60,7
@@
defmodule Pleroma.Application do
[
:object_cache,
[
[
:object_cache,
[
- default_ttl: 25000,
+ default_ttl: 25
_
000,
ttl_interval: 1000,
limit: 2500
]
ttl_interval: 1000,
limit: 2500
]
@@
-110,7
+110,6
@@
defmodule Pleroma.Application do
worker(Pleroma.Web.Federator.RetryQueue, []),
worker(Pleroma.Stats, []),
worker(Pleroma.Web.Push, []),
worker(Pleroma.Web.Federator.RetryQueue, []),
worker(Pleroma.Stats, []),
worker(Pleroma.Web.Push, []),
- worker(Pleroma.Jobs, []),
worker(Task, [&Pleroma.Web.Federator.init/0], restart: :temporary)
] ++
streamer_child() ++
worker(Task, [&Pleroma.Web.Federator.init/0], restart: :temporary)
] ++
streamer_child() ++