mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-20 10:20:51 +00:00
cb6a653777
This replaces the experimental logr v0.4 with the stable v1.1.0
release. This is a breaking API change for some users because:
- Comparing logr.Logger against nil is not possible anymore:
it's now a struct instead of an interface. Code which
allows a nil logger should switch to *logr.Logger as type.
- Logger implementations must be updated in lockstep.
Instead of updating the forked zapr code in json.go, directly using
the original go-logr/zapr is simpler and avoids duplication of effort.
The updated zapr supports logging of numeric verbosity. Error messages
don't have a verbosity (= always get logged), so "v" is not getting
added to them anymore.
Source code logging for panic messages got fixed so that it references
the code with the invalid log call, not the json.go implementation.
Finally, zapr includes additional information in its panic
messages ("zap field", "ignored key", "invalid key").
55 lines
1.4 KiB
Go
55 lines
1.4 KiB
Go
/*
|
|
Copyright 2020 The logr Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package logr
|
|
|
|
// Discard returns a Logger that discards all messages logged to it. It can be
|
|
// used whenever the caller is not interested in the logs. Logger instances
|
|
// produced by this function always compare as equal.
|
|
func Discard() Logger {
|
|
return Logger{
|
|
level: 0,
|
|
sink: discardLogSink{},
|
|
}
|
|
}
|
|
|
|
// discardLogSink is a LogSink that discards all messages.
|
|
type discardLogSink struct{}
|
|
|
|
// Verify that it actually implements the interface
|
|
var _ LogSink = discardLogSink{}
|
|
|
|
func (l discardLogSink) Init(RuntimeInfo) {
|
|
}
|
|
|
|
func (l discardLogSink) Enabled(int) bool {
|
|
return false
|
|
}
|
|
|
|
func (l discardLogSink) Info(int, string, ...interface{}) {
|
|
}
|
|
|
|
func (l discardLogSink) Error(error, string, ...interface{}) {
|
|
}
|
|
|
|
func (l discardLogSink) WithValues(...interface{}) LogSink {
|
|
return l
|
|
}
|
|
|
|
func (l discardLogSink) WithName(string) LogSink {
|
|
return l
|
|
}
|