소스 검색

Merge branch 'trivial/increase-hackney-timeouts' into 'develop'

http: bump connection timeout to 10 seconds

See merge request pleroma/pleroma!1183
tags/v1.1.4
kaniini 5 년 전
부모
커밋
be6b57193a
2개의 변경된 파일2개의 추가작업 그리고 1개의 파일을 삭제
  1. +1
    -0
      CHANGELOG.md
  2. +1
    -1
      lib/pleroma/http/connection.ex

+ 1
- 0
CHANGELOG.md 파일 보기

@@ -73,6 +73,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Don't ship finmoji by default, they can be installed as an emoji pack
- Hide deactivated users and their statuses
- Posts which are marked sensitive or tagged nsfw no longer have link previews.
- HTTP connection timeout is now set to 10 seconds.

### Fixed
- Added an FTS index on objects. Running `vacuum analyze` and setting a larger `work_mem` is recommended.


+ 1
- 1
lib/pleroma/http/connection.ex 파일 보기

@@ -8,7 +8,7 @@ defmodule Pleroma.HTTP.Connection do
"""

@hackney_options [
connect_timeout: 2_000,
connect_timeout: 10_000,
recv_timeout: 20_000,
follow_redirect: true,
pool: :federation


불러오는 중...
취소
저장