Skip to content

Commit

Permalink
Adjust flags on stdlib logger used by HTTP server to get logger adapt…
Browse files Browse the repository at this point in the history
…er extract fields consistents with operator base logger (prometheus-operator#3968)

Co-authored-by: Maxime Therreault <maxime.therreault@ubisoft.com>
  • Loading branch information
mtheck and Maxime Therreault authored Apr 14, 2021
1 parent 0b7eff8 commit 65e18f6
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion cmd/operator/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,10 @@ func Main() int {
srv := &http.Server{
Handler: mux,
TLSConfig: tlsConfig,
ErrorLog: stdlog.New(log.NewStdlibAdapter(logger), "", stdlog.LstdFlags),
// use flags on standard logger to align with base logger and get consistent parsed fields form adapter:
// use shortfile flag to get proper 'caller' field (avoid being wrongly parsed/extracted from message)
// and no datetime related flag to keep 'ts' field from base logger (with controlled format)
ErrorLog: stdlog.New(log.NewStdlibAdapter(logger), "", stdlog.Lshortfile),
}
if srv.TLSConfig == nil {
wg.Go(serve(srv, l, logger))
Expand Down

0 comments on commit 65e18f6

Please sign in to comment.