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

Improve status reporter

Browse Source
This commit is contained in:
Jakob Borg
2015-08-20 14:02:52 +02:00
parent a413b83c01
commit f407ff8861
3 changed files with 68 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/relaysrv/session.go
View File

@@ -110,30 +110,31 @@ func (s *session) Serve() {
close(s.conns)
if debug {
log.Println("Session", s, "starting between", conns[0].RemoteAddr(), conns[1].RemoteAddr())
log.Println("Session", s, "starting between", conns[0].RemoteAddr(), "and", conns[1].RemoteAddr())
}
wg := sync.WaitGroup{}
wg.Add(2)
errors := make(chan error, 2)
var err0 error
go func() {
errors <- s.proxy(conns[0], conns[1])
err0 = s.proxy(conns[0], conns[1])
wg.Done()
}()
var err1 error
go func() {
errors <- s.proxy(conns[1], conns[0])
err1 = s.proxy(conns[1], conns[0])
wg.Done()
}()
wg.Wait()
if debug {
log.Println("Session", s, "ended, outcomes:", <-errors, <-errors)
log.Println("Session", s, "ended, outcomes:", err0, "and", err1)
}
goto done
case <-timedout:
if debug {
log.Println("Session", s, "timed out")