fix pr suggestions and improve start loop

coder · mafredri · Apr 29, 2025 · Apr 28, 2025 · Apr 28, 2025 · Apr 28, 2025
commit aed7c3023cee9dd12ebd18de4f030afb0e81092b
diff --git a/agent/agentcontainers/api.go b/agent/agentcontainers/api.go
@@ -152,10 +152,14 @@ func (api *API) start() {
 	for {
 		event, err := api.watcher.Next(api.ctx)
 		if err != nil {
-			if errors.Is(err, context.Canceled) {
+			if errors.Is(err, watcher.ErrWatcherClosed) {
 				api.logger.Debug(api.ctx, "watcher closed")
 				return
 			}
+			if api.ctx.Err() != nil {
+				api.logger.Debug(api.ctx, "api context canceled")
+				return
+			}
 			api.logger.Error(api.ctx, "watcher error waiting for next event", slog.Error(err))
 			continue
 		}

diff --git a/agent/agentcontainers/watcher/watcher.go b/agent/agentcontainers/watcher/watcher.go
@@ -14,6 +14,8 @@ import (
 	"golang.org/x/xerrors"
 )
 
+var ErrWatcherClosed = xerrors.New("watcher closed")
+
 // Watcher defines an interface for monitoring file system changes.
 // Implementations track file modifications and provide an event stream
 // that clients can consume to react to changes.
@@ -63,28 +65,36 @@ func (f *fsnotifyWatcher) Remove(file string) error {
 	return nil
 }
 
-func (f *fsnotifyWatcher) Next(ctx context.Context) (*fsnotify.Event, error) {
+func (f *fsnotifyWatcher) Next(ctx context.Context) (event *fsnotify.Event, err error) {
+	defer func() {
+		if ctx.Err() != nil {
+			event = nil
+			err = ctx.Err()
+		}
+	}()
+
 	select {
 	case <-ctx.Done():
 		return nil, ctx.Err()
 	case event, ok := <-f.Events:
 		if !ok {
-			return nil, xerrors.New("watcher closed")
+			return nil, ErrWatcherClosed
 		}
 		return &event, nil
 	case err, ok := <-f.Errors:
 		if !ok {
-			return nil, xerrors.New("watcher closed")
+			return nil, ErrWatcherClosed
 		}
 		return nil, xerrors.Errorf("watcher error: %w", err)
 	case <-f.closed:
-		return nil, xerrors.New("watcher closed")
+		return nil, ErrWatcherClosed
 	}
 }
 
 func (f *fsnotifyWatcher) Close() (err error) {
+	err = ErrWatcherClosed
 	f.closeOnce.Do(func() {
-		if err := f.Watcher.Close(); err != nil {
+		if err = f.Watcher.Close(); err != nil {
 			err = xerrors.Errorf("close watcher: %w", err)
 		}
 		close(f.closed)