Skip to content

Commit f415cd9

Browse files
committed
Fix common logger
The common logger was not taking context into consideration and therefore it was not printing out logs the same way as other loggers. With this PR the common logger should now print logs correctly.
1 parent 42f48d1 commit f415cd9

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

internal/controller/common.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import (
3131
ctrl "sigs.k8s.io/controller-runtime"
3232
"sigs.k8s.io/controller-runtime/pkg/client"
3333
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
34+
"sigs.k8s.io/controller-runtime/pkg/log"
3435
)
3536

3637
const (
@@ -489,8 +490,8 @@ func (r *Reconciler) EnsureLogsPVCExists(
489490
}
490491

491492
// GetLogger returns the logger instance
492-
func (r *Reconciler) GetLogger() logr.Logger {
493-
return r.Log
493+
func (r *Reconciler) GetLogger(ctx context.Context) logr.Logger {
494+
return log.FromContext(ctx)
494495
}
495496

496497
// GetScheme returns the runtime scheme
@@ -555,7 +556,7 @@ func (r *Reconciler) AcquireLock(
555556

556557
// ReleaseLock releases the lock for the given instance
557558
func (r *Reconciler) ReleaseLock(ctx context.Context, instance client.Object) (bool, error) {
558-
Log := r.GetLogger()
559+
Log := r.GetLogger(ctx)
559560

560561
cm, err := r.GetLockInfo(ctx, instance)
561562
if err != nil && k8s_errors.IsNotFound(err) {

0 commit comments

Comments
 (0)