diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-09-08 09:31:26 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-09-08 09:31:26 -0500 |
| commit | 21efda2edbfa74e80ad0df6f92b52a16880082e3 (patch) | |
| tree | 2c7877d17a3b038a554e429012478a4665f1eed3 /config/description.exs | |
| parent | 5d814f739cd2bb55822e0cfdb9ad2526d10482bb (diff) | |
| parent | 0a05670b4499d170f6bc0eaecfae0d71be022227 (diff) | |
| download | pleroma-21efda2edbfa74e80ad0df6f92b52a16880082e3.tar.gz pleroma-21efda2edbfa74e80ad0df6f92b52a16880082e3.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted
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 2191e8d6d..d9f9b6b84 100644 --- a/config/description.exs +++ b/config/description.exs @@ -3386,7 +3386,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] @@ -3424,6 +3424,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] } ] } |