go/oauth2-proxy
1
0
Fork 0
mirror of https://github.com/oauth2-proxy/oauth2-proxy.git synced 2025-03-21 21:47:11 +02:00
Code Issues Releases Activity

Panic on any logger errors

Browse Source 
Any template errors instead of IO
errors are caught in validation.
This commit is contained in:
Nick Meves 2020-07-31 14:27:55 -07:00
parent e88d29f16a
commit a1358d2070
No known key found for this signature in database
GPG Key ID: 93BA8A3CEDCDD1CF
1 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/logger/logger.go
View File

@ -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"))