diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2020-09-08 15:16:43 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2020-09-08 15:16:43 +0300 |
| commit | 880a92ccc705553610ca9c877e6823777c1e759e (patch) | |
| tree | 9c24b7e6e7bff975e157b69afedfbb2e78104f1a /config/config.exs | |
| parent | e3f845b24363cd867ab85b7297f2d34bfa16b13f (diff) | |
| parent | d34dc4a7469b97e28ca4fffc8b2387c937ab56d8 (diff) | |
| download | pleroma-880a92ccc705553610ca9c877e6823777c1e759e.tar.gz pleroma-880a92ccc705553610ca9c877e6823777c1e759e.zip | |
Merge branch 'develop' into feature/expire-mutes
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/config/config.exs b/config/config.exs index 0649f3078..84a02bc2e 100644 --- a/config/config.exs +++ b/config/config.exs @@ -547,7 +547,6 @@ config :pleroma, Oban, plugins: [Oban.Plugins.Pruner], crontab: [ {"0 0 * * *", Pleroma.Workers.Cron.ClearOauthTokenWorker}, - {"0 * * * *", Pleroma.Workers.Cron.StatsWorker}, {"* * * * *", Pleroma.Workers.Cron.PurgeExpiredActivitiesWorker}, {"0 0 * * 0", Pleroma.Workers.Cron.DigestEmailsWorker}, {"0 0 * * *", Pleroma.Workers.Cron.NewUsersDigestWorker} @@ -737,28 +736,28 @@ config :pleroma, :connections_pool, max_connections: 250, max_idle_time: 30_000, retry: 0, - await_up_timeout: 5_000 + connect_timeout: 5_000 config :pleroma, :pools, federation: [ size: 50, max_waiting: 10, - timeout: 10_000 + recv_timeout: 10_000 ], media: [ size: 50, max_waiting: 10, - timeout: 10_000 + recv_timeout: 10_000 ], upload: [ size: 25, max_waiting: 5, - timeout: 15_000 + recv_timeout: 15_000 ], default: [ size: 10, max_waiting: 2, - timeout: 5_000 + recv_timeout: 5_000 ] config :pleroma, :hackney_pools, |