mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-10 23:53:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Tweak federation client proxying

Browse source
This commit is contained in:
Neil Alexander 2022-08-11 11:18:48 +01:00
parent b099e7cb75
commit 11802a007e
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
federationapi/inthttp/server.go
View file

@ -221,11 +221,10 @@ func AddRoutes(intAPI api.FederationInternalAPI, internalAPIMux *mux.Router) {
) )
} }
func federationClientError(err error) *api.FederationClientError { func federationClientError(err error) error {
if err == nil {
return nil
}
switch ferr := err.(type) { switch ferr := err.(type) {
case nil:
return nil
case api.FederationClientError: case api.FederationClientError:
return &ferr return &ferr
case *api.FederationClientError: case *api.FederationClientError:

2
internal/httputil/http.go
View file

@ -78,7 +78,7 @@ func PostJSON[reqtype, restype any, errtype error](
} }
if res.StatusCode != http.StatusOK { if res.StatusCode != http.StatusOK {
if len(body) == 0 { if len(body) == 0 {
return fmt.Errorf("HTTP %d from %s", res.StatusCode, apiURL) return fmt.Errorf("HTTP %d from %s (no response body)", res.StatusCode, apiURL)
} }
var reserr errtype var reserr errtype
if err = json.Unmarshal(body, reserr); err != nil { if err = json.Unmarshal(body, reserr); err != nil {