gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

Merge pull request #1332 from lucas-clemente/improve-ack-logging

Browse Source 
improve logging of ACK frames with ranges
This commit is contained in:
Marten Seemann
2018-05-05 13:59:12 +09:00
committed by GitHub
parent 2127e2f1de b83a4c069d
commit 1a1894ea18
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
internal/wire/log.go
View File

@@ -1,6 +1,11 @@
package wire package wire
import "github.com/lucas-clemente/quic-go/internal/utils" import (
"fmt"
"strings"
"github.com/lucas-clemente/quic-go/internal/utils"
)
// LogFrame logs a frame, either sent or received // LogFrame logs a frame, either sent or received
func LogFrame(logger utils.Logger, frame Frame, sent bool) { func LogFrame(logger utils.Logger, frame Frame, sent bool) {
@@ -22,9 +27,13 @@ func LogFrame(logger utils.Logger, frame Frame, sent bool) {
} }
case *AckFrame: case *AckFrame:
if len(f.AckRanges) > 1 { if len(f.AckRanges) > 1 {
logger.Debugf("\t%s &wire.AckFrame{LargestAcked: 0x%x, LowestAcked: 0x%x, AckRanges: %#v, DelayTime: %s}", dir, f.LargestAcked(), f.LowestAcked(), f.AckRanges, f.DelayTime.String()) ackRanges := make([]string, len(f.AckRanges))
for i, r := range f.AckRanges {
ackRanges[i] = fmt.Sprintf("{Largest: %#x, Smallest: %#x}", r.Largest, r.Smallest)
}
logger.Debugf("\t%s &wire.AckFrame{LargestAcked: %#x, LowestAcked: %#x, AckRanges: {%s}, DelayTime: %s}", dir, f.LargestAcked(), f.LowestAcked(), strings.Join(ackRanges, ", "), f.DelayTime.String())
} else { } else {
logger.Debugf("\t%s &wire.AckFrame{LargestAcked: 0x%x, LowestAcked: 0x%x, DelayTime: %s}", dir, f.LargestAcked(), f.LowestAcked(), f.DelayTime.String()) logger.Debugf("\t%s &wire.AckFrame{LargestAcked: %#x, LowestAcked: %#x, DelayTime: %s}", dir, f.LargestAcked(), f.LowestAcked(), f.DelayTime.String())
} }
default: default:
logger.Debugf("\t%s %#v", dir, frame) logger.Debugf("\t%s %#v", dir, frame)

2
internal/wire/log_test.go
View File

@@ -74,7 +74,7 @@ var _ = Describe("Frame logging", func() {
DelayTime: 12 * time.Millisecond, DelayTime: 12 * time.Millisecond,
} }
LogFrame(logger, frame, false) LogFrame(logger, frame, false)
Expect(buf.String()).To(ContainSubstring("\t<- &wire.AckFrame{LargestAcked: 0x8, LowestAcked: 0x2, AckRanges: []wire.AckRange{wire.AckRange{Smallest:0x5, Largest:0x8}, wire.AckRange{Smallest:0x2, Largest:0x3}}, DelayTime: 12ms}\n")) Expect(buf.String()).To(ContainSubstring("\t<- &wire.AckFrame{LargestAcked: 0x8, LowestAcked: 0x2, AckRanges: {{Largest: 0x8, Smallest: 0x5}, {Largest: 0x3, Smallest: 0x2}}, DelayTime: 12ms}\n"))
}) })
It("logs incoming StopWaiting frames", func() { It("logs incoming StopWaiting frames", func() {