mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-08 07:23:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename err to lastErr for the loop

Browse source
This commit is contained in:
Mark Haines 2017-05-25 15:46:35 +01:00
parent d4ff1cde68
commit be9adca916
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/github.com/matrix-org/dendrite/clientapi/writers/joinroom.go
View file

@ -167,12 +167,13 @@ func (r joinRoomReq) joinRoomUsingServers(
}
}
var lastErr error
for _, server := range servers {
var response *util.JSONResponse
response, err = r.joinRoomUsingServer(roomID, server)
if err != nil {
response, lastErr = r.joinRoomUsingServer(roomID, server)
if lastErr != nil {
// There was a problem talking to one of the servers.
util.GetLogger(r.req.Context()).WithError(err).WithField("server", server).Warn("Failed to join room using server")
util.GetLogger(r.req.Context()).WithError(lastErr).WithField("server", server).Warn("Failed to join room using server")
// Try the next server.
continue
}
@ -192,7 +193,7 @@ func (r joinRoomReq) joinRoomUsingServers(
// 4) We couldn't fetch the public keys needed to verify the
// signatures on the state events.
// 5) ...
return httputil.LogThenError(r.req, err)
return httputil.LogThenError(r.req, lastErr)
}
// joinRoomUsingServer tries to join a remote room using a given matrix server.