aboutsummaryrefslogtreecommitdiff
path: root/internal
diff options
context:
space:
mode:
authorNeil Alexander <neilalexander@users.noreply.github.com>2020-10-09 17:08:32 +0100
committerGitHub <noreply@github.com>2020-10-09 17:08:32 +0100
commitfe5d1400bf426d1fea8a6c833088d1e491e9dddc (patch)
tree3986e8152d951ff2d63ae0c889419f30f92b6292 /internal
parent4df7e345bb8a8182c50666e40023909f27f5d607 (diff)
Update federation timeouts (#1504)
* Update to matrix-org/gomatrixserverlib#234 * Update gomatrixserverlib * Update federation timeouts * Fix dendritejs * Increase /send context time in destination queue
Diffstat (limited to 'internal')
-rw-r--r--internal/setup/base.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/internal/setup/base.go b/internal/setup/base.go
index 77fdb04a..24a0d6aa 100644
--- a/internal/setup/base.go
+++ b/internal/setup/base.go
@@ -254,9 +254,9 @@ func (b *BaseDendrite) CreateClient() *gomatrixserverlib.Client {
// CreateFederationClient creates a new federation client. Should only be called
// once per component.
func (b *BaseDendrite) CreateFederationClient() *gomatrixserverlib.FederationClient {
- client := gomatrixserverlib.NewFederationClient(
+ client := gomatrixserverlib.NewFederationClientWithTimeout(
b.Cfg.Global.ServerName, b.Cfg.Global.KeyID, b.Cfg.Global.PrivateKey,
- b.Cfg.FederationSender.DisableTLSValidation,
+ b.Cfg.FederationSender.DisableTLSValidation, time.Minute*5,
)
client.SetUserAgent(fmt.Sprintf("Dendrite/%s", internal.VersionString()))
return client