perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/connections: Fix race condition in parallel dial, minor cleanups (fixes #4526)

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4527
This commit is contained in:
Jakob Borg
2017-11-19 17:38:13 +00:00
committed by Audrius Butkevicius
parent 9471b9f6af
commit 72d645865e
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/connections/structs.go
View File

@@ -188,6 +188,10 @@ type dialTarget struct {
func (t dialTarget) Dial() (internalConn, error) {
l.Debugln("dialing", t.deviceID, t.uri, "prio", t.priority)
conn, err := t.dialer.Dial(t.deviceID, t.uri)
l.Debugln("dialing", t.deviceID, t.uri, "outcome", conn, err)
if err != nil {
l.Debugln("dialing", t.deviceID, t.uri, "error:", err)
} else {
l.Debugln("dialing", t.deviceID, t.uri, "success:", conn)
}
return conn, err
}