projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feat/format-optional-migrations' into 'develop'
[akkoma]
/
lib
/
pleroma
/
http
/
adapter_helper.ex
diff --git
a/lib/pleroma/http/adapter_helper.ex
b/lib/pleroma/http/adapter_helper.ex
index d722973236603ce8880b788c2c661d06568f598b..08b51578a31066c3ed296a4c27fc48bfc566edf0 100644
(file)
--- a/
lib/pleroma/http/adapter_helper.ex
+++ b/
lib/pleroma/http/adapter_helper.ex
@@
-6,7
+6,7
@@
defmodule Pleroma.HTTP.AdapterHelper do
@moduledoc """
Configure Tesla.Client with default and customized adapter options.
"""
@moduledoc """
Configure Tesla.Client with default and customized adapter options.
"""
- @defaults [pool: :federation]
+ @defaults [pool: :federation
, connect_timeout: 5_000, recv_timeout: 5_000
]
@type proxy_type() :: :socks4 | :socks5
@type host() :: charlist() | :inet.ip_address()
@type proxy_type() :: :socks4 | :socks5
@type host() :: charlist() | :inet.ip_address()