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 /docs/configuration/cheatsheet.md | |
| parent | e3f845b24363cd867ab85b7297f2d34bfa16b13f (diff) | |
| parent | d34dc4a7469b97e28ca4fffc8b2387c937ab56d8 (diff) | |
| download | pleroma-880a92ccc705553610ca9c877e6823777c1e759e.tar.gz pleroma-880a92ccc705553610ca9c877e6823777c1e759e.zip | |
Merge branch 'develop' into feature/expire-mutes
Diffstat (limited to 'docs/configuration/cheatsheet.md')
| -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 |