diff options
author | Neil Alexander <neilalexander@users.noreply.github.com> | 2020-10-09 17:08:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-09 17:08:32 +0100 |
commit | fe5d1400bf426d1fea8a6c833088d1e491e9dddc (patch) | |
tree | 3986e8152d951ff2d63ae0c889419f30f92b6292 /federationsender/queue | |
parent | 4df7e345bb8a8182c50666e40023909f27f5d607 (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 'federationsender/queue')
-rw-r--r-- | federationsender/queue/destinationqueue.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/federationsender/queue/destinationqueue.go b/federationsender/queue/destinationqueue.go index e87f0063..29fef705 100644 --- a/federationsender/queue/destinationqueue.go +++ b/federationsender/queue/destinationqueue.go @@ -349,7 +349,7 @@ func (oq *destinationQueue) nextTransaction() (bool, error) { // TODO: we should check for 500-ish fails vs 400-ish here, // since we shouldn't queue things indefinitely in response // to a 400-ish error - ctx, cancel = context.WithTimeout(context.Background(), time.Second*30) + ctx, cancel = context.WithTimeout(context.Background(), time.Minute*5) defer cancel() _, err = oq.client.SendTransaction(ctx, t) switch err.(type) { |