Merge branch 'master' into kegan/send-join-qps

This commit is contained in:
Kegsay 2021-03-08 18:16:21 +00:00 committed by GitHub
commit dda5deb682
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -347,6 +347,9 @@ func (u *DeviceListUpdater) processServer(serverName gomatrixserverlib.ServerNam
} else if fcerr.Blacklisted {
waitTime = time.Hour * 8
}
} else {
waitTime = time.Hour
logger.WithError(err).Warn("GetUserDevices returned unknown error type")
}
hasFailures = true
continue