From 0356e1302a5c6e59c4ef19cd7461f7b33c7a3c36 Mon Sep 17 00:00:00 2001 From: Andres Martinez Gotor Date: Wed, 25 Jun 2025 12:48:36 +0200 Subject: [PATCH] Advisor: improve code readability (#107175) --- apps/advisor/pkg/app/checkscheduler/checkscheduler.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/apps/advisor/pkg/app/checkscheduler/checkscheduler.go b/apps/advisor/pkg/app/checkscheduler/checkscheduler.go index 10706c53fd8..9e382c5315f 100644 --- a/apps/advisor/pkg/app/checkscheduler/checkscheduler.go +++ b/apps/advisor/pkg/app/checkscheduler/checkscheduler.go @@ -85,7 +85,10 @@ func New(cfg app.Config, log logging.Logger) (app.Runnable, error) { func (r *Runner) Run(ctx context.Context) error { logger := r.log.WithContext(ctx) - lastCreated, err := r.checkLastCreated(context.WithoutCancel(ctx), logger) + // We still need the context to eventually be cancelled to exit this function + // but we don't want the requests to fail because of it + ctxWithoutCancel := context.WithoutCancel(ctx) + lastCreated, err := r.checkLastCreated(ctxWithoutCancel, logger) if err != nil { logger.Error("Error getting last check creation time", "error", err) // Wait for interval to create the next scheduled check @@ -93,7 +96,7 @@ func (r *Runner) Run(ctx context.Context) error { } else { // do an initial creation if necessary if lastCreated.IsZero() { - err = r.createChecks(context.WithoutCancel(ctx), logger) + err = r.createChecks(ctxWithoutCancel, logger) if err != nil { logger.Error("Error creating new check reports", "error", err) } else { @@ -109,12 +112,12 @@ func (r *Runner) Run(ctx context.Context) error { for { select { case <-ticker.C: - err = r.createChecks(context.WithoutCancel(ctx), logger) + err = r.createChecks(ctxWithoutCancel, logger) if err != nil { logger.Error("Error creating new check reports", "error", err) } - err = r.cleanupChecks(context.WithoutCancel(ctx), logger) + err = r.cleanupChecks(ctxWithoutCancel, logger) if err != nil { logger.Error("Error cleaning up old check reports", "error", err) }