Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmd/strelaysrv: Outbox will get GCed (fixes #3718)

This commit is contained in:
Audrius Butkevicius 2016-11-11 22:28:46 +00:00 committed by Jakob Borg
parent 38d28c3f4a
commit 94e4370c7e
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/strelaysrv/listener.go
View File

@ -172,7 +172,7 @@ func protocolConnectionHandler(tcpConn net.Conn, config *tls.Config) {
if debug { if debug {
log.Println("Sent invitation from", id, "to", requestedPeer) log.Println("Sent invitation from", id, "to", requestedPeer)
} }
default: case <-time.After(time.Second):
if debug { if debug {
log.Println("Could not send invitation from", id, "to", requestedPeer, "as peer disconnected") log.Println("Could not send invitation from", id, "to", requestedPeer, "as peer disconnected")
} }
@ -204,7 +204,6 @@ func protocolConnectionHandler(tcpConn net.Conn, config *tls.Config) {
if debug { if debug {
log.Printf("Closing connection %s: %s", id, err) log.Printf("Closing connection %s: %s", id, err)
} }
close(outbox)
// Potentially closing a second time. // Potentially closing a second time.
conn.Close() conn.Close()
@ -260,10 +259,6 @@ func protocolConnectionHandler(tcpConn net.Conn, config *tls.Config) {
conn.Close() conn.Close()
case msg := <-outbox: case msg := <-outbox:
if msg == nil {
conn.Close()
return
}
if debug { if debug {
log.Printf("Sending message %T to %s", msg, id) log.Printf("Sending message %T to %s", msg, id)
} }