From 19875b7a42df4fc6fa6c3f92c9b6fff759e012b9 Mon Sep 17 00:00:00 2001 From: Devon Hudson Date: Tue, 18 Jul 2023 12:23:06 -0600 Subject: [PATCH] Add timeout back with longer value --- federationapi/internal/federationclient.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/federationapi/internal/federationclient.go b/federationapi/internal/federationclient.go index a25783f1f..98854d342 100644 --- a/federationapi/internal/federationclient.go +++ b/federationapi/internal/federationclient.go @@ -29,6 +29,8 @@ func (a *FederationInternalAPI) MakeJoin( func (a *FederationInternalAPI) SendJoin( ctx context.Context, origin, s spec.ServerName, event gomatrixserverlib.PDU, ) (res gomatrixserverlib.SendJoinResponse, err error) { + ctx, cancel := context.WithTimeout(ctx, time.Minute*5) + defer cancel() ires, err := a.federation.SendJoin(ctx, origin, s, event) if err != nil { return &fclient.RespSendJoin{}, err