handle context

f0ssel · f0ssel · commit 2d5d27ac4f01 · 2022-09-22T15:25:12.000Z
diff --git a/agent/agent_test.go b/agent/agent_test.go
@@ -628,6 +628,7 @@ func setupAgent(t *testing.T, metadata codersdk.WorkspaceAgentMetadata, ptyTimeo
 				return nil
 			}), nil
 		},
+		WorkspaceAppHealthReporter: func(ctx context.Context) {},
 	})
 	t.Cleanup(func() {
 		_ = closer.Close()
diff --git a/agent/apphealth.go b/agent/apphealth.go
@@ -22,6 +22,9 @@ func NewWorkspaceAppHealthReporter(logger slog.Logger, client *codersdk.Client)
 			err := func() error {
 				apps, err := client.WorkspaceAgentApps(ctx)
 				if err != nil {
+					if xerrors.Is(err, context.Canceled) {
+						return nil
+					}
 					return xerrors.Errorf("getting workspace apps: %w", err)
 				}
 
@@ -125,8 +128,9 @@ func NewWorkspaceAppHealthReporter(logger slog.Logger, client *codersdk.Client)
 			if err != nil {
 				logger.Error(ctx, "failed running workspace app reporter", slog.Error(err))
 				// continue loop with backoff on non-nil errors
-				r.Wait(ctx)
-				continue
+				if r.Wait(ctx) {
+					continue
+				}
 			}
 
 			return
