@@ -29,9 +29,8 @@ type loggerPromise struct {
2929 childPromises []* loggerPromise
3030 promisesLock sync.Mutex
3131
32- name * string
33- tags []interface {}
34- level int
32+ name * string
33+ tags []interface {}
3534}
3635
3736func (p * loggerPromise ) WithName (l * DelegatingLogger , name string ) * loggerPromise {
@@ -61,21 +60,8 @@ func (p *loggerPromise) WithValues(l *DelegatingLogger, tags ...interface{}) *lo
6160 return res
6261}
6362
64- func (p * loggerPromise ) V (l * DelegatingLogger , level int ) * loggerPromise {
65- res := & loggerPromise {
66- logger : l ,
67- level : level ,
68- promisesLock : sync.Mutex {},
69- }
70-
71- p .promisesLock .Lock ()
72- defer p .promisesLock .Unlock ()
73- p .childPromises = append (p .childPromises , res )
74- return res
75- }
76-
7763// Fulfill instantiates the Logger with the provided logger.
78- func (p * loggerPromise ) Fulfill (parentLogger logr.Logger ) {
64+ func (p * loggerPromise ) Fulfill (parentLogger logr.LogSink ) {
7965 var logger = parentLogger
8066 if p .name != nil {
8167 logger = logger .WithName (* p .name )
@@ -84,9 +70,6 @@ func (p *loggerPromise) Fulfill(parentLogger logr.Logger) {
8470 if p .tags != nil {
8571 logger = logger .WithValues (p .tags ... )
8672 }
87- if p .level != 0 {
88- logger = logger .V (p .level )
89- }
9073
9174 p .logger .lock .Lock ()
9275 p .logger .logger = logger
@@ -105,17 +88,23 @@ func (p *loggerPromise) Fulfill(parentLogger logr.Logger) {
10588// a no-op logger before the promises are fulfilled).
10689type DelegatingLogger struct {
10790 lock sync.RWMutex
108- logger logr.Logger
91+ logger logr.LogSink
10992 promise * loggerPromise
93+ info logr.RuntimeInfo
94+ }
95+
96+ // Init implements logr.LogSink.
97+ func (l * DelegatingLogger ) Init (info logr.RuntimeInfo ) {
98+ l .info = info
11099}
111100
112101// Enabled tests whether this Logger is enabled. For example, commandline
113102// flags might be used to set the logging verbosity and disable some info
114103// logs.
115- func (l * DelegatingLogger ) Enabled () bool {
104+ func (l * DelegatingLogger ) Enabled (v int ) bool {
116105 l .lock .RLock ()
117106 defer l .lock .RUnlock ()
118- return l .logger .Enabled ()
107+ return l .logger .Enabled (v )
119108}
120109
121110// Info logs a non-error message with the given key/value pairs as context.
@@ -124,10 +113,10 @@ func (l *DelegatingLogger) Enabled() bool {
124113// the log line. The key/value pairs can then be used to add additional
125114// variable information. The key/value pairs should alternate string
126115// keys and arbitrary values.
127- func (l * DelegatingLogger ) Info (msg string , keysAndValues ... interface {}) {
116+ func (l * DelegatingLogger ) Info (level int , msg string , keysAndValues ... interface {}) {
128117 l .lock .RLock ()
129118 defer l .lock .RUnlock ()
130- l .logger .Info (msg , keysAndValues ... )
119+ l .logger .Info (level , msg , keysAndValues ... )
131120}
132121
133122// Error logs an error, with the given message and key/value pairs as context.
@@ -144,27 +133,8 @@ func (l *DelegatingLogger) Error(err error, msg string, keysAndValues ...interfa
144133 l .logger .Error (err , msg , keysAndValues ... )
145134}
146135
147- // V returns an Logger value for a specific verbosity level, relative to
148- // this Logger. In other words, V values are additive. V higher verbosity
149- // level means a log message is less important. It's illegal to pass a log
150- // level less than zero.
151- func (l * DelegatingLogger ) V (level int ) logr.Logger {
152- l .lock .RLock ()
153- defer l .lock .RUnlock ()
154-
155- if l .promise == nil {
156- return l .logger .V (level )
157- }
158-
159- res := & DelegatingLogger {logger : l .logger }
160- promise := l .promise .V (res , level )
161- res .promise = promise
162-
163- return res
164- }
165-
166136// WithName provides a new Logger with the name appended.
167- func (l * DelegatingLogger ) WithName (name string ) logr.Logger {
137+ func (l * DelegatingLogger ) WithName (name string ) logr.LogSink {
168138 l .lock .RLock ()
169139 defer l .lock .RUnlock ()
170140
@@ -180,7 +150,7 @@ func (l *DelegatingLogger) WithName(name string) logr.Logger {
180150}
181151
182152// WithValues provides a new Logger with the tags appended.
183- func (l * DelegatingLogger ) WithValues (tags ... interface {}) logr.Logger {
153+ func (l * DelegatingLogger ) WithValues (tags ... interface {}) logr.LogSink {
184154 l .lock .RLock ()
185155 defer l .lock .RUnlock ()
186156
@@ -198,15 +168,15 @@ func (l *DelegatingLogger) WithValues(tags ...interface{}) logr.Logger {
198168// Fulfill switches the logger over to use the actual logger
199169// provided, instead of the temporary initial one, if this method
200170// has not been previously called.
201- func (l * DelegatingLogger ) Fulfill (actual logr.Logger ) {
171+ func (l * DelegatingLogger ) Fulfill (actual logr.LogSink ) {
202172 if l .promise != nil {
203173 l .promise .Fulfill (actual )
204174 }
205175}
206176
207177// NewDelegatingLogger constructs a new DelegatingLogger which uses
208178// the given logger before it's promise is fulfilled.
209- func NewDelegatingLogger (initial logr.Logger ) * DelegatingLogger {
179+ func NewDelegatingLogger (initial logr.LogSink ) * DelegatingLogger {
210180 l := & DelegatingLogger {
211181 logger : initial ,
212182 promise : & loggerPromise {promisesLock : sync.Mutex {}},
0 commit comments