MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-25 21:53:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Print golang http errors in MinIO log format (#16465)

Browse Source
This commit is contained in:
Anis Elleuch 2023-01-26 18:16:16 +01:00 committed by GitHub
parent 027ff0f3a8
commit 1fd7946dce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/server-main.go
View File

@ -589,7 +589,7 @@ func serverMain(ctx *cli.Context) {
UseIdleTimeout(ctx.Duration("idle-timeout")). UseIdleTimeout(ctx.Duration("idle-timeout")).
UseReadHeaderTimeout(ctx.Duration("read-header-timeout")). UseReadHeaderTimeout(ctx.Duration("read-header-timeout")).
UseBaseContext(GlobalContext). UseBaseContext(GlobalContext).
UseCustomLogger(log.New(io.Discard, "", 0)) // Turn-off random logging by Go stdlib UseCustomLogger(log.New(&goHTTPLogger{}, "", 0))
go func() { go func() {
globalHTTPServerErrorCh <- httpServer.Start(GlobalContext) globalHTTPServerErrorCh <- httpServer.Start(GlobalContext)

10
cmd/utils.go
View File

@ -1245,3 +1245,13 @@ func MockOpenIDTestUserInteraction(ctx context.Context, pro OpenIDClientAppParam
// fmt.Printf("TOKEN: %s\n", rawIDToken) // fmt.Printf("TOKEN: %s\n", rawIDToken)
return rawIDToken, nil return rawIDToken, nil
} }
// Custom logger for golang http logs
type goHTTPLogger struct{}
func (goHTTPLogger) Write(p []byte) (int, error) {
// Golang std logger ensures that the error message will be sent
// in one Write call so it is okay to print it directly.
logger.LogOnceIf(context.Background(), fmt.Errorf("%s", string(p)), "go-http-logging")
return len(p), nil
}