mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-21 13:53:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Pointers not values

Browse source
This commit is contained in:
Kegan Dougal 2020-08-19 13:01:24 +01:00
parent 42f0b4cddf
commit 5f96a859e1
3 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
federationsender/api/api.go
View file

@ -27,7 +27,7 @@ type FederationClientError struct {
}
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=%d, blacklisted=%v)", e.Err, e.RetryAfter, e.Blacklisted)
}
// FederationSenderInternalAPI is used to query information from the federation sender.

22
federationsender/internal/api.go
View file

@ -10,6 +10,7 @@ import (
"github.com/matrix-org/dendrite/federationsender/storage"
"github.com/matrix-org/dendrite/internal/config"
roomserverAPI "github.com/matrix-org/dendrite/roomserver/api"
"github.com/matrix-org/gomatrix"
"github.com/matrix-org/gomatrixserverlib"
"go.uber.org/atomic"
)
@ -67,6 +68,21 @@ func (a *FederationSenderInternalAPI) isBlacklistedOrBackingOff(s gomatrixserver
return stats, nil
}
func failBlacklistableError(err error, stats *statistics.ServerStatistics) {
if err == nil {
return
}
mxerr, ok := err.(gomatrix.HTTPError)
if !ok {
stats.Failure()
return
}
if mxerr.Code == 500 {
stats.Failure()
return
}
}
func (a *FederationSenderInternalAPI) GetUserDevices(
ctx context.Context, s gomatrixserverlib.ServerName, userID string,
) (gomatrixserverlib.RespUserDevices, error) {
@ -77,7 +93,7 @@ func (a *FederationSenderInternalAPI) GetUserDevices(
}
res, err = a.federation.GetUserDevices(ctx, s, userID)
if err != nil {
stats.Failure()
failBlacklistableError(err, stats)
return res, &api.FederationClientError{
Err: err.Error(),
}
@ -96,7 +112,7 @@ func (a *FederationSenderInternalAPI) ClaimKeys(
}
res, err = a.federation.ClaimKeys(ctx, s, oneTimeKeys)
if err != nil {
stats.Failure()
failBlacklistableError(err, stats)
return res, &api.FederationClientError{
Err: err.Error(),
}
@ -115,7 +131,7 @@ func (a *FederationSenderInternalAPI) QueryKeys(
}
res, err = a.federation.QueryKeys(ctx, s, keys)
if err != nil {
stats.Failure()
failBlacklistableError(err, stats)
return res, &api.FederationClientError{
Err: err.Error(),
}

6
federationsender/inthttp/client.go
View file

@ -159,7 +159,7 @@ func (h *httpFederationSenderInternalAPI) GetUserDevices(
}
var response getUserDevices
apiURL := h.federationSenderURL + FederationSenderGetUserDevicesPath
err := httputil.PostJSON(ctx, span, h.httpClient, apiURL, request, response)
err := httputil.PostJSON(ctx, span, h.httpClient, apiURL, &request, &response)
if err != nil {
return result, err
}
@ -189,7 +189,7 @@ func (h *httpFederationSenderInternalAPI) ClaimKeys(
}
var response claimKeys
apiURL := h.federationSenderURL + FederationSenderClaimKeysPath
err := httputil.PostJSON(ctx, span, h.httpClient, apiURL, request, response)
err := httputil.PostJSON(ctx, span, h.httpClient, apiURL, &request, &response)
if err != nil {
return result, err
}
@ -219,7 +219,7 @@ func (h *httpFederationSenderInternalAPI) QueryKeys(
}
var response queryKeys
apiURL := h.federationSenderURL + FederationSenderQueryKeysPath
err := httputil.PostJSON(ctx, span, h.httpClient, apiURL, request, response)
err := httputil.PostJSON(ctx, span, h.httpClient, apiURL, &request, &response)
if err != nil {
return result, err
}