diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-09-08 11:20:31 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-09-08 11:20:31 +0000 |
| commit | d34dc4a7469b97e28ca4fffc8b2387c937ab56d8 (patch) | |
| tree | 5920e433356a6e118443298cabf8dff2384ee921 /config/config.exs | |
| parent | c5434dbefc5e6a25ffb72debe8ed9e09d77bf885 (diff) | |
| parent | d8a48f838697ce6f1d37f5504c1e51b316aed037 (diff) | |
| download | pleroma-d34dc4a7469b97e28ca4fffc8b2387c937ab56d8.tar.gz pleroma-d34dc4a7469b97e28ca4fffc8b2387c937ab56d8.zip | |
Merge branch 'fix/2108-adapter-options' into 'develop'
Adapter options unification
Closes #2108
See merge request pleroma/pleroma!2952
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/config/config.exs b/config/config.exs index d631c3962..2426fbd52 100644 --- a/config/config.exs +++ b/config/config.exs @@ -735,28 +735,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, |