projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c93c309
)
little polishing
author
Alexander Strizhakov
<alex.strizhakov@gmail.com>
Fri, 6 Mar 2020 18:24:19 +0000
(21:24 +0300)
committer
Alexander Strizhakov
<alex.strizhakov@gmail.com>
Fri, 6 Mar 2020 18:24:19 +0000
(21:24 +0300)
lib/pleroma/http/adapter_helper/gun.ex
patch
|
blob
|
history
lib/pleroma/http/adapter_helper/hackney.ex
patch
|
blob
|
history
lib/pleroma/http/connection.ex
patch
|
blob
|
history
lib/pleroma/pool/connections.ex
patch
|
blob
|
history
diff --git
a/lib/pleroma/http/adapter_helper/gun.ex
b/lib/pleroma/http/adapter_helper/gun.ex
index 9b03f465304464cf06bd13055556411c2a8755e5..862e851c028cc50fba466e636ad608d20c44594c 100644
(file)
--- a/
lib/pleroma/http/adapter_helper/gun.ex
+++ b/
lib/pleroma/http/adapter_helper/gun.ex
@@
-5,11
+5,11
@@
defmodule Pleroma.HTTP.AdapterHelper.Gun do
@behaviour Pleroma.HTTP.AdapterHelper
defmodule Pleroma.HTTP.AdapterHelper.Gun do
@behaviour Pleroma.HTTP.AdapterHelper
- require Logger
-
alias Pleroma.HTTP.AdapterHelper
alias Pleroma.Pool.Connections
alias Pleroma.HTTP.AdapterHelper
alias Pleroma.Pool.Connections
+ require Logger
+
@defaults [
connect_timeout: 5_000,
domain_lookup_timeout: 5_000,
@defaults [
connect_timeout: 5_000,
domain_lookup_timeout: 5_000,
diff --git
a/lib/pleroma/http/adapter_helper/hackney.ex
b/lib/pleroma/http/adapter_helper/hackney.ex
index a0e161eaa27b245eba90a3fb72c9b582e28c73e2..d08afae0cab5d43f89bf68d091cf1780acf9d9b7 100644
(file)
--- a/
lib/pleroma/http/adapter_helper/hackney.ex
+++ b/
lib/pleroma/http/adapter_helper/hackney.ex
@@
-13,8
+13,10
@@
defmodule Pleroma.HTTP.AdapterHelper.Hackney do
def options(connection_opts \\ [], %URI{} = uri) do
proxy = Pleroma.Config.get([:http, :proxy_url], nil)
def options(connection_opts \\ [], %URI{} = uri) do
proxy = Pleroma.Config.get([:http, :proxy_url], nil)
+ config_opts = Pleroma.Config.get([:http, :adapter], [])
+
@defaults
@defaults
- |> Keyword.merge(
Pleroma.Config.get([:http, :adapter], [])
)
+ |> Keyword.merge(
config_opts
)
|> Keyword.merge(connection_opts)
|> add_scheme_opts(uri)
|> Pleroma.HTTP.AdapterHelper.maybe_add_proxy(proxy)
|> Keyword.merge(connection_opts)
|> add_scheme_opts(uri)
|> Pleroma.HTTP.AdapterHelper.maybe_add_proxy(proxy)
diff --git
a/lib/pleroma/http/connection.ex
b/lib/pleroma/http/connection.ex
index 97eec88c1824dd995fe3717f2266a3ff7ab537de..777e5d4c8c7ba5ee2998bfded4d15aebddf4764b 100644
(file)
--- a/
lib/pleroma/http/connection.ex
+++ b/
lib/pleroma/http/connection.ex
@@
-6,6
+6,14
@@
defmodule Pleroma.HTTP.Connection do
@moduledoc """
Configure Tesla.Client with default and customized adapter options.
"""
@moduledoc """
Configure Tesla.Client with default and customized adapter options.
"""
+
+ alias Pleroma.Config
+ alias Pleroma.HTTP.AdapterHelper
+
+ require Logger
+
+ @defaults [pool: :federation]
+
@type ip_address :: ipv4_address() | ipv6_address()
@type ipv4_address :: {0..255, 0..255, 0..255, 0..255}
@type ipv6_address ::
@type ip_address :: ipv4_address() | ipv6_address()
@type ipv4_address :: {0..255, 0..255, 0..255, 0..255}
@type ipv6_address ::
@@
-13,13
+21,6
@@
defmodule Pleroma.HTTP.Connection do
@type proxy_type() :: :socks4 | :socks5
@type host() :: charlist() | ip_address()
@type proxy_type() :: :socks4 | :socks5
@type host() :: charlist() | ip_address()
- @defaults [pool: :federation]
-
- require Logger
-
- alias Pleroma.Config
- alias Pleroma.HTTP.AdapterHelper
-
@doc """
Merge default connection & adapter options with received ones.
"""
@doc """
Merge default connection & adapter options with received ones.
"""
diff --git
a/lib/pleroma/pool/connections.ex
b/lib/pleroma/pool/connections.ex
index f96c08f21584fe066cf0e381450f8931226a3150..7529e9240f33ca4ea03ca374c5679c4d55555661 100644
(file)
--- a/
lib/pleroma/pool/connections.ex
+++ b/
lib/pleroma/pool/connections.ex
@@
-6,6
+6,7
@@
defmodule Pleroma.Pool.Connections do
use GenServer
alias Pleroma.Config
use GenServer
alias Pleroma.Config
+ alias Pleroma.Gun
require Logger
require Logger
@@
-19,8
+20,6
@@
defmodule Pleroma.Pool.Connections do
defstruct conns: %{}, opts: []
defstruct conns: %{}, opts: []
- alias Pleroma.Gun
-
@spec start_link({atom(), keyword()}) :: {:ok, pid()}
def start_link({name, opts}) do
GenServer.start_link(__MODULE__, opts, name: name)
@spec start_link({atom(), keyword()}) :: {:ok, pid()}
def start_link({name, opts}) do
GenServer.start_link(__MODULE__, opts, name: name)