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

allowing use printToStdout, printToFile and printToWriter at the same time for Logger of package glog #2990

Merged
merged 1 commit into from
Oct 7, 2023
Merged
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
25 changes: 13 additions & 12 deletions os/glog/glog_logger.go
Original file line number Diff line number Diff line change
Expand Up @@ -222,21 +222,22 @@ func (l *Logger) print(ctx context.Context, level int, stack string, values ...a
// doDefaultPrint outputs the logging content according configuration.
func (l *Logger) doDefaultPrint(ctx context.Context, input *HandlerInput) *bytes.Buffer {
var buffer *bytes.Buffer
if l.config.Writer == nil {
// Allow output to stdout?
if l.config.StdoutPrint {
if buf := l.printToStdout(ctx, input); buf != nil {
buffer = buf
}
// Allow output to stdout?
if l.config.StdoutPrint {
if buf := l.printToStdout(ctx, input); buf != nil {
buffer = buf
}
}

// Output content to disk file.
if l.config.Path != "" {
if buf := l.printToFile(ctx, input.Time, input); buf != nil {
buffer = buf
}
// Output content to disk file.
if l.config.Path != "" {
if buf := l.printToFile(ctx, input.Time, input); buf != nil {
buffer = buf
}
} else {
}

// Used custom writer.
if l.config.Writer != nil {
// Output to custom writer.
if buf := l.printToWriter(ctx, input); buf != nil {
buffer = buf
Expand Down
Loading