create a logger interface and use it everywhere

This commit is contained in:
Marten Seemann
2018-03-28 07:30:36 +07:00
parent 1e9b3f0bb2
commit 948eef3e42
52 changed files with 411 additions and 281 deletions

View File

@@ -15,33 +15,34 @@ import (
var _ = Describe("Frame logging", func() {
var (
buf bytes.Buffer
buf *bytes.Buffer
logger utils.Logger
)
BeforeEach(func() {
buf.Reset()
utils.SetLogLevel(utils.LogLevelDebug)
log.SetOutput(&buf)
buf = &bytes.Buffer{}
logger = utils.DefaultLogger
logger.SetLogLevel(utils.LogLevelDebug)
log.SetOutput(buf)
})
AfterSuite(func() {
utils.SetLogLevel(utils.LogLevelNothing)
AfterEach(func() {
log.SetOutput(os.Stdout)
})
It("doesn't log when debug is disabled", func() {
utils.SetLogLevel(utils.LogLevelInfo)
LogFrame(&RstStreamFrame{}, true)
logger.SetLogLevel(utils.LogLevelInfo)
LogFrame(logger, &RstStreamFrame{}, true)
Expect(buf.Len()).To(BeZero())
})
It("logs sent frames", func() {
LogFrame(&RstStreamFrame{}, true)
LogFrame(logger, &RstStreamFrame{}, true)
Expect(buf.Bytes()).To(ContainSubstring("\t-> &wire.RstStreamFrame{StreamID:0x0, ErrorCode:0x0, ByteOffset:0x0}\n"))
})
It("logs received frames", func() {
LogFrame(&RstStreamFrame{}, false)
LogFrame(logger, &RstStreamFrame{}, false)
Expect(buf.Bytes()).To(ContainSubstring("\t<- &wire.RstStreamFrame{StreamID:0x0, ErrorCode:0x0, ByteOffset:0x0}\n"))
})
@@ -51,7 +52,7 @@ var _ = Describe("Frame logging", func() {
Offset: 0x1337,
Data: bytes.Repeat([]byte{'f'}, 0x100),
}
LogFrame(frame, false)
LogFrame(logger, frame, false)
Expect(buf.Bytes()).To(ContainSubstring("\t<- &wire.StreamFrame{StreamID: 42, FinBit: false, Offset: 0x1337, Data length: 0x100, Offset + Data length: 0x1437}\n"))
})
@@ -61,7 +62,7 @@ var _ = Describe("Frame logging", func() {
LowestAcked: 0x42,
DelayTime: 1 * time.Millisecond,
}
LogFrame(frame, false)
LogFrame(logger, frame, false)
Expect(buf.Bytes()).To(ContainSubstring("\t<- &wire.AckFrame{LargestAcked: 0x1337, LowestAcked: 0x42, AckRanges: []wire.AckRange(nil), DelayTime: 1ms}\n"))
})
@@ -69,7 +70,7 @@ var _ = Describe("Frame logging", func() {
frame := &StopWaitingFrame{
LeastUnacked: 0x1337,
}
LogFrame(frame, false)
LogFrame(logger, frame, false)
Expect(buf.Bytes()).To(ContainSubstring("\t<- &wire.StopWaitingFrame{LeastUnacked: 0x1337}\n"))
})
@@ -78,7 +79,7 @@ var _ = Describe("Frame logging", func() {
LeastUnacked: 0x1337,
PacketNumberLen: protocol.PacketNumberLen4,
}
LogFrame(frame, true)
LogFrame(logger, frame, true)
Expect(buf.Bytes()).To(ContainSubstring("\t-> &wire.StopWaitingFrame{LeastUnacked: 0x1337, PacketNumberLen: 0x4}\n"))
})
})