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/description.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/description.exs')
| -rw-r--r-- | config/description.exs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/config/description.exs b/config/description.exs index 18c133f02..eac97ad64 100644 --- a/config/description.exs +++ b/config/description.exs @@ -3377,7 +3377,7 @@ config :pleroma, :config_description, [ suggestions: [250] }, %{ - key: :await_up_timeout, + key: :connect_timeout, type: :integer, description: "Timeout while `gun` will wait until connection is up. Default: 5000ms.", suggestions: [5000] @@ -3415,6 +3415,12 @@ config :pleroma, :config_description, [ description: "Maximum number of requests waiting for other requests to finish. After this number is reached, the pool will start returning errrors when a new request is made", suggestions: [10] + }, + %{ + key: :recv_timeout, + type: :integer, + description: "Timeout for the pool while gun will wait for response", + suggestions: [10_000] } ] } |