export ClearLogger

Code in Kubernetes also needs the ability to unset a logger.

Author: pohly

klog.go

@@ -862,14 +862,19 @@ func (rb *redirectBuffer) Write(bytes []byte) (n int, err error) {
 // Use as:
 //   ...
 //   klog.SetLogger(zapr.NewLogger(zapLog))
+//
+// To remove a backing logr implemention, use ClearLogger. Setting an
+// empty logger with SetLogger(logr.Logger{}) does not work.
 func SetLogger(logr logr.Logger) {
 	logging.mu.Lock()
 	defer logging.mu.Unlock()
 
 	logging.logr = &logr
 }
 
-func clearLogger() {
+// ClearLogger removes a backing logr implementation if one was set earlier
+// with SetLogger.
+func ClearLogger() {
 	logging.mu.Lock()
 	defer logging.mu.Unlock()
 

klog_test.go

@@ -1377,7 +1377,7 @@ func TestInfoSWithLogr(t *testing.T) {
 		t.Run(data.msg, func(t *testing.T) {
 			l := logr.New(logger)
 			SetLogger(l)
-			defer clearLogger()
+			defer ClearLogger()
 			defer logger.reset()
 
 			InfoS(data.msg, data.keysValues...)
@@ -1445,7 +1445,7 @@ func TestErrorSWithLogr(t *testing.T) {
 		t.Run(data.msg, func(t *testing.T) {
 			l := logr.New(logger)
 			SetLogger(l)
-			defer clearLogger()
+			defer ClearLogger()
 			defer logger.reset()
 
 			ErrorS(data.err, data.msg, data.keysValues...)
@@ -1503,7 +1503,7 @@ func TestCallDepthLogr(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			l := logr.New(logger)
 			SetLogger(l)
-			defer clearLogger()
+			defer ClearLogger()
 			defer logger.reset()
 			defer logger.resetCallDepth()