From c6799f1e2a67391586e0c08e45e601a98185b640 Mon Sep 17 00:00:00 2001 From: Till Faelligen <2353100+S7evinK@users.noreply.github.com> Date: Wed, 7 Sep 2022 15:55:03 +0200 Subject: [PATCH] Use the same waitTime and status code range --- keyserver/internal/device_list_update.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyserver/internal/device_list_update.go b/keyserver/internal/device_list_update.go index 38226d213..41534fe82 100644 --- a/keyserver/internal/device_list_update.go +++ b/keyserver/internal/device_list_update.go @@ -408,7 +408,7 @@ userLoop: } else if e.Blacklisted { waitTime = time.Hour * 8 break userLoop - } else if e.Code > 0 { + } else if e.Code >= 300 { // We didn't get a real FederationClientError (e.g. in polylith mode, where gomatrix.HTTPError // are "converted" to FederationClientError), but we probably shouldn't hit them every $waitTime seconds. waitTime = time.Hour @@ -426,7 +426,7 @@ userLoop: // The remote server returned an error, give it some time to recover. // This is to avoid spamming remote servers, which may not be Matrix servers anymore. if e.Code >= 300 { - waitTime = time.Minute * 10 + waitTime = time.Hour logrus.WithError(e).Error("GetUserDevices returned gomatrix.HTTPError") break userLoop }