Skip to content

Commit 6ffc5a1

Browse files
committed
fix: error not returned if context canceled
Signed-off-by: Ilya Lesikov <ilya@lesikov.com>
1 parent 8615bb2 commit 6ffc5a1

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

pkg/tracker/canary/tracker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ func (canary *Tracker) Track(ctx context.Context) error {
123123
fmt.Printf("Canary `%s` tracker context canceled: %s\n", canary.ResourceName, context.Cause(ctx))
124124
}
125125

126-
return nil
126+
return context.Cause(ctx)
127127
case err := <-canary.errors:
128128
return err
129129
}

pkg/tracker/daemonset/tracker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ func (d *Tracker) Track(ctx context.Context) error {
260260
fmt.Printf("DaemonSet `%s` tracker context canceled: %s\n", d.ResourceName, context.Cause(ctx))
261261
}
262262

263-
return nil
263+
return context.Cause(ctx)
264264
case err := <-d.errors:
265265
return err
266266
}

pkg/tracker/deployment/tracker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ func (d *Tracker) Track(ctx context.Context) (err error) {
379379
fmt.Printf("Deployment `%s` tracker context canceled: %s\n", d.ResourceName, context.Cause(ctx))
380380
}
381381

382-
return nil
382+
return context.Cause(ctx)
383383
case err := <-d.errors:
384384
return err
385385
}

pkg/tracker/generic/tracker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ func (t *Tracker) Track(ctx context.Context, noActivityTimeout time.Duration, ad
127127
fmt.Printf("`%s` tracker context canceled: %s\n", t.ResourceID, context.Cause(ctx))
128128
}
129129

130-
return nil
130+
return context.Cause(ctx)
131131
}
132132
}
133133
}

pkg/tracker/job/tracker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ func (job *Tracker) Track(ctx context.Context) error {
244244
fmt.Printf("Job `%s` tracker context canceled: %s\n", job.ResourceName, context.Cause(ctx))
245245
}
246246

247-
return nil
247+
return context.Cause(ctx)
248248
case err := <-job.errors:
249249
return err
250250
}

pkg/tracker/statefulset/tracker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ func (d *Tracker) Track(ctx context.Context) (err error) {
284284
fmt.Printf("Statefulset `%s` tracker context canceled: %s\n", d.ResourceName, context.Cause(ctx))
285285
}
286286

287-
return nil
287+
return context.Cause(ctx)
288288
case err := <-d.errors:
289289
return err
290290
}

0 commit comments

Comments
 (0)