diff --git a/controller/controller.go b/controller/controller.go index 6d8035fe9..3952dbc2e 100644 --- a/controller/controller.go +++ b/controller/controller.go @@ -273,7 +273,7 @@ func (c *Impl) WorkQueue() workqueue.RateLimitingInterface { func (c *Impl) EnqueueAfter(obj interface{}, after time.Duration) { object, err := kmeta.DeletionHandlingAccessor(obj) if err != nil { - c.logger.Errorw("Enqueue", zap.Error(err)) + c.logger.Errorw("EnqueueAfter", zap.Error(err)) return } c.EnqueueKeyAfter(types.NamespacedName{Namespace: object.GetNamespace(), Name: object.GetName()}, after) @@ -540,7 +540,7 @@ func (c *Impl) processNextWorkItem() bool { // Run Reconcile, passing it the namespace/name string of the // resource to be synced. if err = c.Reconciler.Reconcile(ctx, keyStr); err != nil { - c.handleErr(err, key, startTime) + c.handleErr(logger, err, key, startTime) return true } @@ -552,18 +552,18 @@ func (c *Impl) processNextWorkItem() bool { return true } -func (c *Impl) handleErr(err error, key types.NamespacedName, startTime time.Time) { +func (c *Impl) handleErr(logger *zap.SugaredLogger, err error, key types.NamespacedName, startTime time.Time) { if IsSkipKey(err) { c.workQueue.Forget(key) return } if ok, delay := IsRequeueKey(err); ok { c.workQueue.AddAfter(key, delay) - c.logger.Debugf("Requeuing key %s (by request) after %v (depth: %d)", safeKey(key), delay, c.workQueue.Len()) + logger.Debugf("Requeuing key %s (by request) after %v (depth: %d)", safeKey(key), delay, c.workQueue.Len()) return } - c.logger.Errorw("Reconcile error", zap.Duration("duration", time.Since(startTime)), zap.Error(err)) + logger.Errorw("Reconcile error", zap.Duration("duration", time.Since(startTime)), zap.Error(err)) // Re-queue the key if it's a transient error. // We want to check that the queue is shutting down here @@ -571,7 +571,7 @@ func (c *Impl) handleErr(err error, key types.NamespacedName, startTime time.Tim // being processed, queue.Len==0). if !IsPermanentError(err) && !c.workQueue.ShuttingDown() { c.workQueue.AddRateLimited(key) - c.logger.Debugf("Requeuing key %s due to non-permanent error (depth: %d)", safeKey(key), c.workQueue.Len()) + logger.Debugf("Requeuing key %s due to non-permanent error (depth: %d)", safeKey(key), c.workQueue.Len()) return }