commit - 87ae8514a3a2d9684994a6c319f96ba9e18a062e
commit + 2da28ffa5677256a39b68be0a167e698c05e81bd
blob - 984958022d113b06920ca64f2defedba90925620
blob + 1d405a5be8fa906e04062e8e70cd46d1b8d89b6e
--- channel.go
+++ channel.go
}
if err := ch.conn.SetReadDeadline(deadline); err != nil {
- log.Printf("transport: error setting read deadline on %v: %v", ch.conn.RemoteAddr(), err)
+ log.Printf("p9p: transport: error setting read deadline on %v: %v", ch.conn.RemoteAddr(), err)
}
n, err := readmsg(ch.brd, ch.rdbuf)
}
if err := ch.conn.SetWriteDeadline(deadline); err != nil {
- log.Printf("transport: error setting read deadline on %v: %v", ch.conn.RemoteAddr(), err)
+ log.Printf("p9p: transport: error setting read deadline on %v: %v", ch.conn.RemoteAddr(), err)
}
if err := ch.maybeTruncate(fcall); err != nil {
blob - b431cfca9cf08d90aea6371980a85fba35a5b4e7
blob + 2b3a8caea3212c37caaa11f60ff99340d1518969
--- encoding.go
+++ encoding.go
"encoding/binary"
"fmt"
"io"
- "log"
"reflect"
"strings"
"time"
b := make([]byte, ll)
// must consume entire dir entry.
- n, err := io.ReadFull(d.rd, b)
- if err != nil {
- log.Println("dir readfull failed:", err, ll, n)
+ if _, err := io.ReadFull(d.rd, b); err != nil {
return err
}
blob - 776e851f7bd9ecbf7ed8508af1878e5dca60d486
blob + 401170cb8af30866a0254cfdbc5985dc34b5947f
--- server.go
+++ server.go
go c.read(requests)
go c.write(responses)
- log.Println("server.run()")
for {
select {
case req := <-requests:
switch msg := req.Message.(type) {
case MessageTflush:
- log.Println("server: flushing message", msg.Oldtag)
-
var resp *Fcall
// check if we have actually know about the requested flush
active, ok := tags[msg.Oldtag]
// the context was canceled for some reason, perhaps timeout or
// due to a flush call. We treat this as a condition where a
// response should not be sent.
- log.Println("canceled", resp, active.ctx.Err())
}
delete(tags, resp.Tag)
case <-c.ctx.Done():
// TODO(stevvooe): A full idle timeout on the
// connection should be enforced here. We log here,
// since this is less common.
- log.Printf("9p server: temporary error writing fcall: %v", err)
+ log.Printf("p9p: temporary error writing fcall: %v", err)
continue
}
}
blob - 83d3ce1931c4e35c573ccc40da290fbb48e5dc32
blob + 7615fbac24a36c0bfa5aa9234cbb61edac462a60
--- transport.go
+++ transport.go
// handle takes messages off the wire and wakes up the waiting tag call.
func (t *transport) handle() {
defer func() {
- log.Println("exited handle loop")
close(t.closed)
}()
// loop to read messages off of the connection
go func() {
defer func() {
- log.Println("exited read loop")
t.close() // single main loop
}()
loop:
}
}
- log.Println("fatal error reading msg:", err)
+ log.Println("p9p: fatal error reading msg:", err)
return
}
case <-t.ctx.Done():
return
case <-t.closed:
- log.Println("transport closed")
return
case responses <- fcall:
}