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 /docs/configuration | |
| parent | c5434dbefc5e6a25ffb72debe8ed9e09d77bf885 (diff) | |
| parent | d8a48f838697ce6f1d37f5504c1e51b316aed037 (diff) | |
| download | pleroma-d34dc4a7469b97e28ca4fffc8b2387c937ab56d8.tar.gz | |
Merge branch 'fix/2108-adapter-options' into 'develop'
Adapter options unification
Closes #2108
See merge request pleroma/pleroma!2952
Diffstat (limited to 'docs/configuration')
| -rw-r--r-- | docs/configuration/cheatsheet.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md index a9a650fab..7f0725b48 100644 --- a/docs/configuration/cheatsheet.md +++ b/docs/configuration/cheatsheet.md @@ -498,7 +498,7 @@ Settings for HTTP connection pool. * `:connection_acquisition_wait` - Timeout to acquire a connection from pool.The total max time is this value multiplied by the number of retries. * `connection_acquisition_retries` - Number of attempts to acquire the connection from the pool if it is overloaded. Each attempt is timed `:connection_acquisition_wait` apart. * `:max_connections` - Maximum number of connections in the pool. -* `:await_up_timeout` - Timeout to connect to the host. +* `:connect_timeout` - Timeout to connect to the host. * `:reclaim_multiplier` - Multiplied by `:max_connections` this will be the maximum number of idle connections that will be reclaimed in case the pool is overloaded. ### :pools @@ -517,7 +517,7 @@ There are four pools used: For each pool, the options are: * `:size` - limit to how much requests can be concurrently executed. -* `:timeout` - timeout while `gun` will wait for response +* `:recv_timeout` - timeout while `gun` will wait for response * `:max_waiting` - limit to how much requests can be waiting for others to finish, after this is reached, subsequent requests will be dropped. ## Captcha |