LBRYCommunity/reflector.go
1
0
Fork 0
Code Issues 7 Pull requests Projects Releases 10 Packages Wiki Activity

ignore some errors in peer proto, add write deadline to peer proto

Browse source
This commit is contained in:
Alex Grintsvayg 2019-01-25 16:49:45 -05:00
parent b0b2d21a08
commit e03810903a
No known key found for this signature in database
GPG key ID: AEB3F089F86A22B5
1 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
peer/server.go
View file

@ -7,6 +7,7 @@ import (
"encoding/json"
"io"
"net"
"strings"
"time"
"github.com/lbryio/lbry.go/extras/errors"
@ -112,7 +113,7 @@ func (s *Server) handleConnection(conn net.Conn) {
request, err = readNextRequest(conn)
if err != nil {
if err != io.EOF {
log.Errorln(err)
s.logError(err)
}
return
}
@ -142,14 +143,24 @@ func (s *Server) handleConnection(conn net.Conn) {
return
}
err = conn.SetWriteDeadline(time.Now().Add(timeoutDuration))
if err != nil {
log.Error(errors.FullTrace(err))
}
n, err := conn.Write(response)
if err != nil {
log.Errorln(err)
s.logError(err)
return
} else if n != len(response) {
log.Errorln(io.ErrShortWrite)
return
}
err = conn.SetWriteDeadline(time.Time{})
if err != nil {
log.Error(errors.FullTrace(err))
}
}
}
@ -271,6 +282,24 @@ func (s *Server) handleCompositeRequest(data []byte) ([]byte, error) {
return append(respData, blob...), nil
}
func (s *Server) logError(e error) {
if e == nil {
return
}
err := errors.Wrap(e, 0)
// these happen because the peer protocol does not have a way to cancel blob downloads
// so the client will just close the connection if its in the middle of downloading a blob
// but receives the blob from a different peer first
if strings.Contains(err.Error(), "read: connection reset by peer") ||
strings.Contains(err.Error(), "write: broken pipe") {
return
}
log.Error(errors.FullTrace(e))
}
func readNextRequest(conn net.Conn) ([]byte, error) {
request := make([]byte, 0)
eof := false