butter/dendrite
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

gb vendor updates

Browse source 
gb vendor update github.com/matrix-org/gomatrixserverlib
gb vendor update github.com/matrix-org/util
This commit is contained in:
Richard van der Hoff 2017-10-02 10:33:43 +01:00
parent b7687310fe
commit 831a76ae91
5 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
vendor/src/github.com/matrix-org/gomatrixserverlib/client.go vendored
View file

@ -92,7 +92,13 @@ func (f *federationTripper) RoundTrip(r *http.Request) (*http.Response, error) {
if err != nil {
return nil, err
}
if len(dnsResult.Addrs) == 0 {
return nil, fmt.Errorf("no address found for matrix host %v", serverName)
}
var resp *http.Response
// TODO: respect the priority and weight fields from the SRV record
for _, addr := range dnsResult.Addrs {
u := makeHTTPSURL(r.URL, addr)
r.URL = &u
@ -100,8 +106,12 @@ func (f *federationTripper) RoundTrip(r *http.Request) (*http.Response, error) {
if err == nil {
return resp, nil
}
util.GetLogger(r.Context()).Warnf("Error sending request to %s: %v",
u.String(), err)
}
return nil, fmt.Errorf("no address found for matrix host %v", serverName)
// just return the most recent error
return nil, err
}
// LookupUserInfo gets information about a user from a given matrix homeserver
@ -253,9 +263,10 @@ func (fc *Client) CreateMediaDownloadRequest(
func (fc *Client) doHTTPRequest(ctx context.Context, req *http.Request) (*http.Response, error) {
reqID := util.RandomString(12)
logger := util.GetLogger(ctx).WithField("server", req.URL.Host).WithField("out.req.ID", reqID)
newCtx := util.ContextWithLogger(ctx, logger)
logger.Infof("Outgoing request %s %s", req.Method, req.URL)
resp, err := fc.client.Do(req.WithContext(ctx))
resp, err := fc.client.Do(req.WithContext(newCtx))
if err != nil {
logger.Infof("Outgoing request %s %s failed with %v", req.Method, req.URL, err)
return nil, err