char
/
dendrite
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Backoff for 401s (#1410) 

* Backoff for 401s

* Human-readable retry_after in logs
main
Neil Alexander 2020-09-08 13:41:08 +01:00 committed by GitHub
parent 726ad6ce2e
commit 668a722ee0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
federationsender/api/api.go
View File

@ -30,7 +30,7 @@ type FederationClientError struct {
} }
func (e *FederationClientError) Error() string { func (e *FederationClientError) Error() string {
return fmt.Sprintf("%s - (retry_after=%d, blacklisted=%v)", e.Err, e.RetryAfter, e.Blacklisted) return fmt.Sprintf("%s - (retry_after=%s, blacklisted=%v)", e.Err, e.RetryAfter.String(), e.Blacklisted)
} }
// FederationSenderInternalAPI is used to query information from the federation sender. // FederationSenderInternalAPI is used to query information from the federation sender.

5
federationsender/internal/api.go
View File

@ -70,7 +70,10 @@ func failBlacklistableError(err error, stats *statistics.ServerStatistics) (unti
if !ok { if !ok {
return stats.Failure() return stats.Failure()
} }
if mxerr.Code >= 500 && mxerr.Code < 600 { if mxerr.Code == 401 { // invalid signature in X-Matrix header
return stats.Failure()
}
if mxerr.Code >= 500 && mxerr.Code < 600 { // internal server errors
return stats.Failure() return stats.Failure()
} }
return return