From cc98de88ce28775136e66fbdeba7a0af4fa33d14 Mon Sep 17 00:00:00 2001 From: Cameron Moore Date: Thu, 28 May 2020 18:17:41 -0500 Subject: [PATCH 1/2] Fix godoc comment on LogEntry.Panic --- internal/middleware/logger.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/middleware/logger.go b/internal/middleware/logger.go index 50c6a44..5e74360 100644 --- a/internal/middleware/logger.go +++ b/internal/middleware/logger.go @@ -50,7 +50,7 @@ func (l *LogEntry) Write(status, bytes int, elapsed time.Duration) { log.Print(l.buf.String()) } -/// Panic prints the call stack for a panic. +// Panic prints the call stack for a panic. func (l *LogEntry) Panic(v interface{}, stack []byte) { e := l.NewLogEntry(l.req).(*LogEntry) fmt.Fprintf(e.buf, "panic: %#v", v) From 3d824b47b74547df7bfbe681c5e4250bec9405bf Mon Sep 17 00:00:00 2001 From: Cameron Moore Date: Thu, 28 May 2020 18:20:07 -0500 Subject: [PATCH 2/2] Rename var to avoid shadowing bytes package importShadow: shadow of imported package 'bytes' (gocritic) --- internal/middleware/logger.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/middleware/logger.go b/internal/middleware/logger.go index 5e74360..899dd1c 100644 --- a/internal/middleware/logger.go +++ b/internal/middleware/logger.go @@ -39,13 +39,13 @@ type LogEntry struct { } // Write constructs and writes the final log entry. -func (l *LogEntry) Write(status, bytes int, elapsed time.Duration) { +func (l *LogEntry) Write(status, totalBytes int, elapsed time.Duration) { rid := GetReqID(l.req.Context()) if rid != "" { fmt.Fprintf(l.buf, "[%s] ", rid) } - fmt.Fprintf(l.buf, "%03d | %s | %s | ", status, humanize.IBytes(uint64(bytes)), elapsed) + fmt.Fprintf(l.buf, "%03d | %s | %s | ", status, humanize.IBytes(uint64(totalBytes)), elapsed) l.buf.WriteString(l.req.Host + " | " + l.req.Method + " " + l.req.RequestURI) log.Print(l.buf.String()) }