git.iko.soy/typeable/oauth2-proxy
on master help sign in
Panic on any logger errors
a1358d2Nick Meves
pkg/logger/logger.go+3−25
compare with master
unifiedsplit
@@ -137,15 +137,8 @@ func (l *Logger) Output(calldepth int, message string) {
137 File: file,
137 File: file,
138 Message: message,
138 Message: message,
139 })
139 })
140− // Fallback for template errors
141 if err != nil {
140 if err != nil {
142− _, ferr := fmt.Fprintf(l.writer, "[%s] [%s] %s",
143− FormatTimestamp(now),
144− file,
145− message)
146− if ferr != nil {
147− panic(ferr)
141+ panic(err)
148− }
149 }
142 }
150
143
151 _, err = l.writer.Write([]byte("\n"))
144 _, err = l.writer.Write([]byte("\n"))
@@ -184,17 +177,8 @@ func (l *Logger) PrintAuthf(username string, req *http.Request, status AuthStatu
184 Status: string(status),
177 Status: string(status),
185 Message: fmt.Sprintf(format, a...),
178 Message: fmt.Sprintf(format, a...),
186 })
179 })
187− // Fallback for template errors
188 if err != nil {
180 if err != nil {
189− _, ferr := fmt.Fprintf(l.writer, "%s - %s [%s] [%s] %s",
190− client,
191− username,
192− FormatTimestamp(now),
193− string(status),
194− fmt.Sprintf(format, a...))
195− if ferr != nil {
196− panic(ferr)
181+ panic(err)
197− }
198 }
182 }
199
183
200 _, err = l.writer.Write([]byte("\n"))
184 _, err = l.writer.Write([]byte("\n"))
@@ -250,14 +234,8 @@ func (l *Logger) PrintReq(username, upstream string, req *http.Request, url url.
250 UserAgent: fmt.Sprintf("%q", req.UserAgent()),
234 UserAgent: fmt.Sprintf("%q", req.UserAgent()),
251 Username: username,
235 Username: username,
252 })
236 })
253− // Fallback for template errors
254 if err != nil {
237 if err != nil {
255− _, ferr := fmt.Fprintf(l.writer, "%s - %s [%s] %s %s %s %q %s %q %d %d %0.3f",
256− client, username, FormatTimestamp(ts), req.Host, req.Method, upstream,
257− url.RequestURI(), req.Proto, req.UserAgent(), status, size, duration)
258− if ferr != nil {
259− panic(ferr)
238+ panic(err)
260− }
261 }
239 }
262
240
263 _, err = l.writer.Write([]byte("\n"))
241 _, err = l.writer.Write([]byte("\n"))