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 | |
| 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')
| -rw-r--r-- | config/config.exs | 10 | ||||
| -rw-r--r-- | config/description.exs | 8 | ||||
| -rw-r--r-- | config/test.exs | 2 |
3 files changed, 13 insertions, 7 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, 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] } ] } diff --git a/config/test.exs b/config/test.exs index f0358e384..e9c2273e8 100644 --- a/config/test.exs +++ b/config/test.exs @@ -114,7 +114,7 @@ config :pleroma, Pleroma.Plugs.RemoteIp, enabled: false config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: true -config :pleroma, :instances_favicons, enabled: true +config :pleroma, :instances_favicons, enabled: false config :pleroma, Pleroma.Uploaders.S3, bucket: nil, |