Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: split logs to stdout and stderr #166

Merged
merged 3 commits into from
Aug 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions lib/logger.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
package lib

import (
"io"
"os"

"github.com/rs/zerolog"
)

type SpecificLevelWriter struct {
io.Writer
Levels []zerolog.Level
}

func (w SpecificLevelWriter) WriteLevel(level zerolog.Level, p []byte) (int, error) {
for _, l := range w.Levels {
if l == level {
return w.Write(p)
}
}
return len(p), nil
}

func CreateLogger(minimumLevel zerolog.Level) zerolog.Logger {
writer := zerolog.MultiLevelWriter(
SpecificLevelWriter{
Writer: zerolog.ConsoleWriter{Out: os.Stdout, TimeFormat: "15:04:05"},
Levels: []zerolog.Level{
zerolog.DebugLevel, zerolog.InfoLevel, zerolog.WarnLevel,
},
},
SpecificLevelWriter{
Writer: zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: "15:04:05"},
Levels: []zerolog.Level{
zerolog.ErrorLevel, zerolog.FatalLevel, zerolog.PanicLevel,
},
},
)

return zerolog.New(writer).Level(minimumLevel).With().Timestamp().Logger()
}
4 changes: 2 additions & 2 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ import (
"os/signal"

"github.com/checkmarx/2ms/cmd"
"github.com/checkmarx/2ms/lib"

"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
)

func main() {
zerolog.SetGlobalLevel(zerolog.InfoLevel)
// send all logs to stdout
log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: "15:04:05"})
log.Logger = lib.CreateLogger(zerolog.InfoLevel)

// this block sets up a go routine to listen for an interrupt signal
// which will immediately exit gitleaks
Expand Down
Loading