From 83daf12fe569cf9964d5e4f48ede0e3ba89b0d31 Mon Sep 17 00:00:00 2001 From: Devon Hudson Date: Tue, 25 Apr 2023 16:09:22 -0600 Subject: [PATCH] Increase federated join timeouts --- federationapi/internal/federationclient.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/federationapi/internal/federationclient.go b/federationapi/internal/federationclient.go index 957166bd8..f0480f5db 100644 --- a/federationapi/internal/federationclient.go +++ b/federationapi/internal/federationclient.go @@ -15,7 +15,7 @@ import ( func (a *FederationInternalAPI) MakeJoin( ctx context.Context, origin, s spec.ServerName, roomID, userID string, ) (res gomatrixserverlib.MakeJoinResponse, err error) { - ctx, cancel := context.WithTimeout(ctx, time.Second*30) + ctx, cancel := context.WithTimeout(ctx, time.Minute) defer cancel() ires, err := a.doRequestIfNotBlacklisted(s, func() (interface{}, error) { return a.federation.MakeJoin(ctx, origin, s, roomID, userID) @@ -30,7 +30,7 @@ func (a *FederationInternalAPI) MakeJoin( func (a *FederationInternalAPI) SendJoin( ctx context.Context, origin, s spec.ServerName, event *gomatrixserverlib.Event, ) (res gomatrixserverlib.SendJoinResponse, err error) { - ctx, cancel := context.WithTimeout(ctx, time.Second*30) + ctx, cancel := context.WithTimeout(ctx, time.Minute) defer cancel() ires, err := a.doRequestIfNotBlacklisted(s, func() (interface{}, error) { return a.federation.SendJoin(ctx, origin, s, event)