projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into refactor/gun-pool-registry
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index 6fc84efc2abae11b90bc31620b1f93b93435f185..2d3f35e70253cc3cf654ad4e792a8fecbb0f07c8 100644
(file)
--- a/
config/config.exs
+++ b/
config/config.exs
@@
-172,7
+172,7
@@
config :mime, :types, %{
"application/ld+json" => ["activity+json"]
}
"application/ld+json" => ["activity+json"]
}
-config :tesla, adapter: Tesla.Adapter.
Hackney
+config :tesla, adapter: Tesla.Adapter.
Gun
# Configures http settings, upstream proxy etc.
config :pleroma, :http,
# Configures http settings, upstream proxy etc.
config :pleroma, :http,
@@
-512,6
+512,7
@@
config :pleroma, Oban,
attachments_cleanup: 5,
new_users_digest: 1
],
attachments_cleanup: 5,
new_users_digest: 1
],
+ plugins: [Oban.Plugins.Pruner],
crontab: [
{"0 0 * * *", Pleroma.Workers.Cron.ClearOauthTokenWorker},
{"0 * * * *", Pleroma.Workers.Cron.StatsWorker},
crontab: [
{"0 0 * * *", Pleroma.Workers.Cron.ClearOauthTokenWorker},
{"0 * * * *", Pleroma.Workers.Cron.StatsWorker},
@@
-647,32
+648,30
@@
config :pleroma, Pleroma.Repo,
prepare: :unnamed
config :pleroma, :connections_pool,
prepare: :unnamed
config :pleroma, :connections_pool,
- checkin_timeout: 250,
+ reclaim_multiplier: 0.1,
+ connection_acquisition_wait: 250,
+ connection_acquisition_retries: 5,
max_connections: 250,
max_connections: 250,
-
retry: 1
,
- retry
_timeout: 100
0,
+
max_idle_time: 30_000
,
+ retry
:
0,
await_up_timeout: 5_000
config :pleroma, :pools,
federation: [
size: 50,
await_up_timeout: 5_000
config :pleroma, :pools,
federation: [
size: 50,
- max_overflow: 10,
- timeout: 150_000
+ max_waiting: 10
],
media: [
size: 50,
],
media: [
size: 50,
- max_overflow: 10,
- timeout: 150_000
+ max_waiting: 10
],
upload: [
size: 25,
],
upload: [
size: 25,
- max_overflow: 5,
- timeout: 300_000
+ max_waiting: 5
],
default: [
size: 10,
],
default: [
size: 10,
- max_overflow: 2,
- timeout: 10_000
+ max_waiting: 2
]
config :pleroma, :hackney_pools,
]
config :pleroma, :hackney_pools,