diff --git a/integration_tests/klog_test.go b/integration_tests/klog_test.go index 565fd8ac4..2e4626977 100644 --- a/integration_tests/klog_test.go +++ b/integration_tests/klog_test.go @@ -98,7 +98,7 @@ func TestDestinationsWithDifferentFlags(t *testing.T) { "everything disabled": { // Nothing, including the trace on fatal, is showing anywhere - flags: []string{"-logtostderr=false", "-alsologtostderr=false", "-stderrthreshold=1000"}, + flags: []string{"-logtostderr=false", "-alsologtostderr=false", "-stderrthreshold=0", "-alsologtostderrthreshold=1000"}, notExpectedOnStderr: allLogREs, }, @@ -106,7 +106,7 @@ func TestDestinationsWithDifferentFlags(t *testing.T) { // Everything above -stderrthreshold, including the trace on fatal, will // be logged to stderr, even if we set -logtostderr to false. - flags: []string{"-logtostderr=false", "-alsologtostderr=false", "-stderrthreshold=1"}, + flags: []string{"-logtostderr=false", "-alsologtostderr=false", "-stderrthreshold=0", "-alsologtostderrthreshold=1"}, expectedOnStderr: res{warningLogRE, errorLogRE, stackTraceRE}, notExpectedOnStderr: res{infoLogRE}, @@ -114,7 +114,7 @@ func TestDestinationsWithDifferentFlags(t *testing.T) { "with logtostderr only": { // Everything, including the trace on fatal, goes to stderr - flags: []string{"-logtostderr=true", "-alsologtostderr=false", "-stderrthreshold=1000"}, + flags: []string{"-logtostderr=true", "-alsologtostderr=false", "-stderrthreshold=0", "-alsologtostderrthreshold=1000"}, expectedOnStderr: allLogREs, }, @@ -122,7 +122,7 @@ func TestDestinationsWithDifferentFlags(t *testing.T) { // Everything, including the trace on fatal, goes to the single log file logfile: true, - flags: []string{"-logtostderr=false", "-alsologtostderr=false", "-stderrthreshold=1000"}, + flags: []string{"-logtostderr=false", "-alsologtostderr=false", "-stderrthreshold=0", "-alsologtostderrthreshold=1000"}, expectedLogFile: true, @@ -133,7 +133,7 @@ func TestDestinationsWithDifferentFlags(t *testing.T) { // Everything, including the trace on fatal, goes to the log files in the log dir logdir: true, - flags: []string{"-logtostderr=false", "-alsologtostderr=false", "-stderrthreshold=1000"}, + flags: []string{"-logtostderr=false", "-alsologtostderr=false", "-stderrthreshold=0", "-alsologtostderrthreshold=1000"}, expectedLogDir: true, @@ -145,7 +145,7 @@ func TestDestinationsWithDifferentFlags(t *testing.T) { // Everything, including the trace on fatal, goes to the log files in the log dir logdir: true, - flags: []string{"-logtostderr=false", "-alsologtostderr=false", "-stderrthreshold=1000", "-one_output=true"}, + flags: []string{"-logtostderr=false", "-alsologtostderr=false", "-stderrthreshold=0", "-alsologtostderrthreshold=1000", "-one_output=true"}, expectedLogDir: true, @@ -158,7 +158,7 @@ func TestDestinationsWithDifferentFlags(t *testing.T) { // ignored, nothing goes to the log files in the log dir. logdir: true, - flags: []string{"-logtostderr=true", "-alsologtostderr=false", "-stderrthreshold=1000"}, + flags: []string{"-logtostderr=true", "-alsologtostderr=false", "-stderrthreshold=0", "-alsologtostderrthreshold=1000"}, expectedOnStderr: allLogREs, }, @@ -168,7 +168,7 @@ func TestDestinationsWithDifferentFlags(t *testing.T) { logdir: true, logfile: true, - flags: []string{"-logtostderr=false", "-alsologtostderr=false", "-stderrthreshold=1000"}, + flags: []string{"-logtostderr=false", "-alsologtostderr=false", "-stderrthreshold=0", "-alsologtostderrthreshold=1000"}, expectedLogFile: true, @@ -179,7 +179,7 @@ func TestDestinationsWithDifferentFlags(t *testing.T) { // Everything, including the trace on fatal, goes to the single log file // AND to stderr. - flags: []string{"-alsologtostderr=true", "-logtostderr=false", "-stderrthreshold=1000"}, + flags: []string{"-alsologtostderr=true", "-logtostderr=false", "-stderrthreshold=0", "-alsologtostderrthreshold=1000"}, logfile: true, expectedLogFile: true, @@ -192,7 +192,7 @@ func TestDestinationsWithDifferentFlags(t *testing.T) { // log dir AND to stderr. logdir: true, - flags: []string{"-alsologtostderr=true", "-logtostderr=false", "-stderrthreshold=1000"}, + flags: []string{"-alsologtostderr=true", "-logtostderr=false", "-stderrthreshold=0", "-alsologtostderrthreshold=1000"}, expectedLogDir: true, @@ -205,7 +205,7 @@ func TestDestinationsWithDifferentFlags(t *testing.T) { // log dir AND to stderr. logdir: true, - flags: []string{"-alsologtostderr=true", "-logtostderr=false", "-stderrthreshold=1000", "-one_output=true"}, + flags: []string{"-alsologtostderr=true", "-logtostderr=false", "-stderrthreshold=0", "-alsotostderrthreshold=1000", "-one_output=true"}, expectedLogDir: true, diff --git a/klog.go b/klog.go index e042e2bc6..779dd475f 100644 --- a/klog.go +++ b/klog.go @@ -43,7 +43,10 @@ // Logs are written to standard error instead of to files. // -alsologtostderr=false // Logs are written to standard error as well as to files. -// -stderrthreshold=ERROR +// -stderrthreshold=INFO +// Log events at or above this severity are logged to standard +// error. +// -alsologtostderrthreshold=ERROR // Log events at or above this severity are logged to standard // error as well as to files. // -log_dir="" @@ -91,10 +94,10 @@ import ( "github.com/go-logr/logr" ) -// severity identifies the sort of log: info, warning etc. It also implements -// the flag.Value interface. The -stderrthreshold flag is of type severity and -// should be modified only through the flag.Value interface. The values match -// the corresponding constants in C++. +// severity identifies the sort of log: info, warning etc. It also implements the +// flag.Value interface. The -stderrthreshold and -alsologtostderrthreshold flags are +// of type severity and should be modified only through the flag.Value interface. +// The values match the corresponding constants in C++. type severity int32 // sync/atomic int32 // These constants identify the log levels in order of increasing severity. @@ -403,7 +406,8 @@ type flushSyncWriter interface { // init sets up the defaults and runs flushDaemon. func init() { - logging.stderrThreshold = errorLog // Default stderrThreshold is ERROR. + logging.stderrThreshold = infoLog // Default stderrThreshold is ERROR. + logging.alsoToStderrThreshold = errorLog // Default alsoToStderrThreshold is ERROR. logging.setVState(0, nil, false) logging.logDir = "" logging.logFile = "" @@ -436,6 +440,7 @@ func InitFlags(flagset *flag.FlagSet) { flagset.BoolVar(&logging.oneOutput, "one_output", logging.oneOutput, "If true, only write logs to their native severity level (vs also writing to each lower severity level)") flagset.BoolVar(&logging.skipLogHeaders, "skip_log_headers", logging.skipLogHeaders, "If true, avoid headers when opening log files") flagset.Var(&logging.stderrThreshold, "stderrthreshold", "logs at or above this threshold go to stderr") + flagset.Var(&logging.alsoToStderrThreshold, "alsologtostderrthreshold", "logs at or above this threshold go to stderr as well as files") flagset.Var(&logging.vmodule, "vmodule", "comma-separated list of pattern=N settings for file-filtered logging") flagset.Var(&logging.traceLocation, "log_backtrace_at", "when logging hits line file:N, emit a stack trace") } @@ -454,7 +459,8 @@ type loggingT struct { alsoToStderr bool // The -alsologtostderr flag. // Level flag. Handled atomically. - stderrThreshold severity // The -stderrthreshold flag. + stderrThreshold severity // The -stderrthreshold flag. + alsoToStderrThreshold severity // The -alsologtostderrthreshold flag. // freeList is a list of byte buffers, maintained under freeListMu. freeList *buffer @@ -915,9 +921,11 @@ func (l *loggingT) output(s severity, log logr.Logger, buf *buffer, file string, log.Info(string(data)) } } else if l.toStderr { - os.Stderr.Write(data) + if s >= l.stderrThreshold.get() { + os.Stderr.Write(data) + } } else { - if alsoToStderr || l.alsoToStderr || s >= l.stderrThreshold.get() { + if alsoToStderr || l.alsoToStderr || s >= l.alsoToStderrThreshold.get() { os.Stderr.Write(data) } @@ -968,7 +976,7 @@ func (l *loggingT) output(s severity, log logr.Logger, buf *buffer, file string, // Dump all goroutine stacks before exiting. trace := stacks(true) // Write the stack trace for all goroutines to the stderr. - if l.toStderr || l.alsoToStderr || s >= l.stderrThreshold.get() || alsoToStderr { + if l.toStderr || l.alsoToStderr || s >= l.alsoToStderrThreshold.get() || alsoToStderr { os.Stderr.Write(trace) } // Write the stack trace for all goroutines to the files. diff --git a/klog_test.go b/klog_test.go index ba4349b1c..4098838a3 100644 --- a/klog_test.go +++ b/klog_test.go @@ -1427,19 +1427,20 @@ func (l *testLogr) WithValues(...interface{}) logr.Logger { // existedFlag contains all existed flag, without KlogPrefix var existedFlag = map[string]struct{}{ - "log_dir": {}, - "add_dir_header": {}, - "alsologtostderr": {}, - "log_backtrace_at": {}, - "log_file": {}, - "log_file_max_size": {}, - "logtostderr": {}, - "one_output": {}, - "skip_headers": {}, - "skip_log_headers": {}, - "stderrthreshold": {}, - "v": {}, - "vmodule": {}, + "log_dir": {}, + "add_dir_header": {}, + "alsologtostderr": {}, + "alsologtostderrthreshold": {}, + "log_backtrace_at": {}, + "log_file": {}, + "log_file_max_size": {}, + "logtostderr": {}, + "one_output": {}, + "skip_headers": {}, + "skip_log_headers": {}, + "stderrthreshold": {}, + "v": {}, + "vmodule": {}, } // KlogPrefix define new flag prefix