fluxcd
/
source-controller
mirror of https://github.com/fluxcd/source-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Wrap err with context instead of logging twice 

This wraps the errors which are returned instead of logging them, as
the returned error is logged at the end of the reconcile run.

Signed-off-by: Hidde Beydals <hello@hidde.co>
This commit is contained in:
Hidde Beydals 2021-08-10 13:59:28 +02:00
parent b49a809c93
commit 29f207d7c8
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
controllers/bucket_controller.go
View File

@ -365,7 +365,7 @@ func (r *BucketReconciler) reconcileSource(ctx context.Context, obj *sourcev1.Bu
// Calculate revision checksum from the collected index values // Calculate revision checksum from the collected index values
revision, err := r.revision(index) revision, err := r.revision(index)
if err != nil { if err != nil {
ctrl.LoggerFrom(ctx).Error(err, "failed to calculate revision") err = fmt.Errorf("failed to calculate revision for index: %w", err)
return ctrl.Result{}, err return ctrl.Result{}, err
} }
@ -443,22 +443,21 @@ func (r *BucketReconciler) reconcileArtifact(ctx context.Context, obj *sourcev1.
// Ensure target path exists and is a directory // Ensure target path exists and is a directory
if f, err := os.Stat(dir); err != nil { if f, err := os.Stat(dir); err != nil {
ctrl.LoggerFrom(ctx).Error(err, "failed to stat source path") err = fmt.Errorf("failed to stat target path: %w", err)
return ctrl.Result{}, err return ctrl.Result{}, err
} else if !f.IsDir() { } else if !f.IsDir() {
err := fmt.Errorf("source path '%s' is not a directory", dir) err = fmt.Errorf("invalid target path: '%s' is not a directory", dir)
ctrl.LoggerFrom(ctx).Error(err, "invalid target path")
return ctrl.Result{}, err return ctrl.Result{}, err
} }
// Ensure artifact directory exists and acquire lock // Ensure artifact directory exists and acquire lock
if err := r.Storage.MkdirAll(artifact); err != nil { if err := r.Storage.MkdirAll(artifact); err != nil {
ctrl.LoggerFrom(ctx).Error(err, "failed to create artifact directory") err = fmt.Errorf("failed to create artifact directory: %w", err)
return ctrl.Result{}, err return ctrl.Result{}, err
} }
unlock, err := r.Storage.Lock(artifact) unlock, err := r.Storage.Lock(artifact)
if err != nil { if err != nil {
ctrl.LoggerFrom(ctx).Error(err, "failed to acquire lock for artifact") err = fmt.Errorf("failed to acquire lock for artifact: %w", err)
return ctrl.Result{}, err return ctrl.Result{}, err
} }
defer unlock() defer unlock()

9
controllers/gitrepository_controller.go
View File

@ -401,22 +401,21 @@ func (r *GitRepositoryReconciler) reconcileArtifact(ctx context.Context, obj *so
// Ensure target path exists and is a directory // Ensure target path exists and is a directory
if f, err := os.Stat(dir); err != nil { if f, err := os.Stat(dir); err != nil {
ctrl.LoggerFrom(ctx).Error(err, "failed to stat source path") err = fmt.Errorf("failed to stat target path: %w", err)
return ctrl.Result{}, err return ctrl.Result{}, err
} else if !f.IsDir() { } else if !f.IsDir() {
err := fmt.Errorf("source path '%s' is not a directory", dir) err = fmt.Errorf("invalid target path: '%s' is not a directory", dir)
ctrl.LoggerFrom(ctx).Error(err, "invalid target path")
return ctrl.Result{}, err return ctrl.Result{}, err
} }
// Ensure artifact directory exists and acquire lock // Ensure artifact directory exists and acquire lock
if err := r.Storage.MkdirAll(artifact); err != nil { if err := r.Storage.MkdirAll(artifact); err != nil {
ctrl.LoggerFrom(ctx).Error(err, "failed to create artifact directory") err = fmt.Errorf("failed to create artifact directory: %w", err)
return ctrl.Result{}, err return ctrl.Result{}, err
} }
unlock, err := r.Storage.Lock(artifact) unlock, err := r.Storage.Lock(artifact)
if err != nil { if err != nil {
ctrl.LoggerFrom(ctx).Error(err, "failed to acquire lock for artifact") err = fmt.Errorf("failed to acquire lock for artifact: %w", err)
return ctrl.Result{}, err return ctrl.Result{}, err
} }
defer unlock() defer unlock()