From a1358d207035fd4e6a189d328cb07b766e2a7e3c Mon Sep 17 00:00:00 2001 From: Nick Meves Date: Fri, 31 Jul 2020 14:27:55 -0700 Subject: [PATCH] Panic on any logger errors Any template errors instead of IO errors are caught in validation. --- pkg/logger/logger.go | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/pkg/logger/logger.go b/pkg/logger/logger.go index 53eec71d..e0ce61dd 100644 --- a/pkg/logger/logger.go +++ b/pkg/logger/logger.go @@ -137,15 +137,8 @@ func (l *Logger) Output(calldepth int, message string) { File: file, Message: message, }) - // Fallback for template errors if err != nil { - _, ferr := fmt.Fprintf(l.writer, "[%s] [%s] %s", - FormatTimestamp(now), - file, - message) - if ferr != nil { - panic(ferr) - } + panic(err) } _, err = l.writer.Write([]byte("\n")) @@ -184,17 +177,8 @@ func (l *Logger) PrintAuthf(username string, req *http.Request, status AuthStatu Status: string(status), Message: fmt.Sprintf(format, a...), }) - // Fallback for template errors if err != nil { - _, ferr := fmt.Fprintf(l.writer, "%s - %s [%s] [%s] %s", - client, - username, - FormatTimestamp(now), - string(status), - fmt.Sprintf(format, a...)) - if ferr != nil { - panic(ferr) - } + panic(err) } _, err = l.writer.Write([]byte("\n")) @@ -250,14 +234,8 @@ func (l *Logger) PrintReq(username, upstream string, req *http.Request, url url. UserAgent: fmt.Sprintf("%q", req.UserAgent()), Username: username, }) - // Fallback for template errors if err != nil { - _, ferr := fmt.Fprintf(l.writer, "%s - %s [%s] %s %s %s %q %s %q %d %d %0.3f", - client, username, FormatTimestamp(ts), req.Host, req.Method, upstream, - url.RequestURI(), req.Proto, req.UserAgent(), status, size, duration) - if ferr != nil { - panic(ferr) - } + panic(err) } _, err = l.writer.Write([]byte("\n"))