a
/
zlog
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix: mutil.fancyWriter.ReadFrom records number of bytes written (#256) 

Without this hlog.AccessHnalder reports a size written of 0 when the
ReadFrom method is used. This is easily visible when using
http.FileServer where all files are served with a logged size of 0.
This commit is contained in:
Jack Christensen 2021-04-21 20:22:35 -05:00 committed by GitHub
parent 582f0cf0e3
commit 0f923d7926
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hlog/internal/mutil/writer_proxy.go
View File

@ -124,11 +124,16 @@ func (f *fancyWriter) Hijack() (net.Conn, *bufio.ReadWriter, error) {
func (f *fancyWriter) ReadFrom(r io.Reader) (int64, error) { func (f *fancyWriter) ReadFrom(r io.Reader) (int64, error) {
if f.basicWriter.tee != nil { if f.basicWriter.tee != nil {
return io.Copy(&f.basicWriter, r) n, err := io.Copy(&f.basicWriter, r)
f.bytes += int(n)
return n, err
} }
rf := f.basicWriter.ResponseWriter.(io.ReaderFrom) rf := f.basicWriter.ResponseWriter.(io.ReaderFrom)
f.basicWriter.maybeWriteHeader() f.basicWriter.maybeWriteHeader()
return rf.ReadFrom(r)
n, err := rf.ReadFrom(r)
f.bytes += int(n)
return n, err
} }
type flushWriter struct { type flushWriter struct {