From 86e9ab8f2018a6fc5713af1d6f8e53a75d559548 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Fri, 13 Mar 2020 12:59:42 +0700 Subject: [PATCH] use buffered qlog writers in example client and server, and interop --- example/client/main.go | 9 ++++++++- example/main.go | 9 ++++++++- interop/utils/logging.go | 9 ++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/example/client/main.go b/example/client/main.go index 488b96aa9..ec06f2ccd 100644 --- a/example/client/main.go +++ b/example/client/main.go @@ -1,6 +1,7 @@ package main import ( + "bufio" "bytes" "crypto/tls" "crypto/x509" @@ -61,7 +62,13 @@ func main() { log.Fatal(err) } log.Printf("Creating qlog file %s.\n", filename) - return f + return struct { + io.Writer + io.Closer + }{ + bufio.NewWriter(f), + f, + } } } roundTripper := &http3.RoundTripper{ diff --git a/example/main.go b/example/main.go index 60fe0d717..0a9f93211 100644 --- a/example/main.go +++ b/example/main.go @@ -1,6 +1,7 @@ package main import ( + "bufio" "crypto/md5" "errors" "flag" @@ -215,7 +216,13 @@ func main() { log.Fatal(err) } log.Printf("Creating qlog file %s.\n", filename) - return f + return struct { + io.Writer + io.Closer + }{ + bufio.NewWriter(f), + f, + } } } diff --git a/interop/utils/logging.go b/interop/utils/logging.go index 97eb297a6..c5d814ea6 100644 --- a/interop/utils/logging.go +++ b/interop/utils/logging.go @@ -1,6 +1,7 @@ package utils import ( + "bufio" "fmt" "io" "log" @@ -38,6 +39,12 @@ func GetQLOGWriter() (func(connID []byte) io.WriteCloser, error) { if err != nil { log.Fatalf("Failed to create qlog file %s: %s", path, err.Error()) } - return f + return struct { + io.Writer + io.Closer + }{ + bufio.NewWriter(f), + f, + } }, nil }