mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 19:31:44 +00:00
Merge pull request #106146 from pohly/json-output-default
component-base: use stderr as default output stream for JSON
This commit is contained in:
commit
f1b000db7c
@ -54,6 +54,8 @@ func NewLoggerCommand() *cobra.Command {
|
||||
}
|
||||
|
||||
func runLogger() {
|
||||
fmt.Println("This is normal output via stdout.")
|
||||
fmt.Fprintln(os.Stderr, "This is other output via stderr.")
|
||||
klog.Infof("Log using Infof, key: %s", "value")
|
||||
klog.InfoS("Log using InfoS", "key", "value")
|
||||
err := errors.New("fail")
|
||||
|
@ -93,6 +93,7 @@ var _ registry.LogFormatFactory = Factory{}
|
||||
|
||||
func (f Factory) Create(options config.FormatOptions) (logr.Logger, func()) {
|
||||
if options.JSON.SplitStream {
|
||||
// stdout for info messages, stderr for errors.
|
||||
infoStream := zapcore.Lock(os.Stdout)
|
||||
size := options.JSON.InfoBufferSize.Value()
|
||||
if size > 0 {
|
||||
@ -107,7 +108,9 @@ func (f Factory) Create(options config.FormatOptions) (logr.Logger, func()) {
|
||||
}
|
||||
return NewJSONLogger(infoStream, zapcore.Lock(os.Stderr))
|
||||
}
|
||||
out := zapcore.Lock(os.Stdout)
|
||||
// The default is to write to stderr (same as in klog's text output,
|
||||
// doesn't get mixed with normal program output).
|
||||
out := zapcore.Lock(os.Stderr)
|
||||
return NewJSONLogger(out, out)
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user