From d3220c5db9ce015ec88c10a350003822e0b7b3e2 Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Mon, 25 Sep 2023 17:19:27 -0500 Subject: [PATCH] fix: resolve flake in log sender by checking context (#9865) See: https://github.com/coder/coder/actions/runs/6305051172/job/17117693579 --- codersdk/agentsdk/logs.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codersdk/agentsdk/logs.go b/codersdk/agentsdk/logs.go index 8f300f4c3e..ff63e68d60 100644 --- a/codersdk/agentsdk/logs.go +++ b/codersdk/agentsdk/logs.go @@ -153,7 +153,7 @@ func LogsSender(sourceID uuid.UUID, patchLogs func(ctx context.Context, req Patc // error occurs. Note that we use the main context here, // meaning these requests won't be interrupted by // shutdown. - for r := retry.New(time.Second, 5*time.Second); r.Wait(ctx); { + for r := retry.New(time.Second, 5*time.Second); r.Wait(ctx) && ctx.Err() == nil; { err := patchLogs(ctx, PatchLogs{ Logs: backlog, LogSourceID: sourceID,