summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Strizhakov <alex.strizhakov@gmail.com>2020-04-29 16:31:37 +0300
committerAlexander Strizhakov <alex.strizhakov@gmail.com>2020-05-06 13:25:49 +0300
commita563203618ae027b33503a6855947bd51e1f7f02 (patch)
tree1b9612a438524a52891243a7a375af7778cd39f6
parentd645b7114eed2d48e8381428577f68226e392b4e (diff)
removing unused checkin_timeout option
-rw-r--r--config/config.exs1
-rw-r--r--config/description.exs6
-rw-r--r--docs/configuration/cheatsheet.md1
-rw-r--r--test/pool/connections_test.exs2
4 files changed, 1 insertions, 9 deletions
diff --git a/config/config.exs b/config/config.exs
index b1c318369..ee953c6c8 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -606,7 +606,6 @@ config :pleroma, Pleroma.Repo,
prepare: :unnamed
config :pleroma, :connections_pool,
- checkin_timeout: 250,
max_connections: 250,
max_idle_time: 1,
closing_idle_conns_interval: 1,
diff --git a/config/description.exs b/config/description.exs
index 48d6a1ef4..71a16c26c 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -2930,12 +2930,6 @@ config :pleroma, :config_description, [
description: "Advanced settings for `gun` connections pool",
children: [
%{
- key: :checkin_timeout,
- type: :integer,
- description: "Timeout to checkin connection from pool. Default: 250ms.",
- suggestions: [250]
- },
- %{
key: :max_connections,
type: :integer,
description: "Maximum number of connections in the pool. Default: 250 connections.",
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md
index febdca71e..6f7012af2 100644
--- a/docs/configuration/cheatsheet.md
+++ b/docs/configuration/cheatsheet.md
@@ -396,7 +396,6 @@ Advanced settings for connections pool. Pool with opened connections. These conn
For big instances it's recommended to increase `max_connections` up to 500-1000. It will increase memory usage, but federation would work faster.
-* `:checkin_timeout` - timeout to checkin connection from pool. Default: 250ms.
* `:max_connections` - maximum number of connections in the pool. Default: 250 connections.
* `:max_idle_time` - maximum of time in minutes, while connection can be idle. Default: 1 minute.
* `:closing_idle_conns_interval` - interval between cleaning pool in minutes from idle connections. Default: 1 minute.
diff --git a/test/pool/connections_test.exs b/test/pool/connections_test.exs
index ddc91fbb1..d8436997f 100644
--- a/test/pool/connections_test.exs
+++ b/test/pool/connections_test.exs
@@ -784,7 +784,7 @@ defmodule Pleroma.Pool.ConnectionsTest do
test "count/1" do
name = :test_count
- {:ok, _} = Connections.start_link({name, [checkin_timeout: 150]})
+ {:ok, _} = Connections.start_link({name, []})
assert Connections.count(name) == 0
Connections.add_conn(name, "1", %Conn{conn: self()})
assert Connections.count(name) == 1