s/ErrWatcherClosed/ErrClosed/g

mafredri · mafredri · commit 0b1644805217 · 2025-04-28T13:03:59.000Z
diff --git a/agent/agentcontainers/api.go b/agent/agentcontainers/api.go
@@ -152,7 +152,7 @@ func (api *API) start() {
 	for {
 		event, err := api.watcher.Next(api.ctx)
 		if err != nil {
-			if errors.Is(err, watcher.ErrWatcherClosed) {
+			if errors.Is(err, watcher.ErrClosed) {
 				api.logger.Debug(api.ctx, "watcher closed")
 				return
 			}
diff --git a/agent/agentcontainers/watcher/noop.go b/agent/agentcontainers/watcher/noop.go
@@ -32,15 +32,15 @@ func (n *noopWatcher) Next(ctx context.Context) (*fsnotify.Event, error) {
 	case <-ctx.Done():
 		return nil, ctx.Err()
 	case <-n.done:
-		return nil, ErrWatcherClosed
+		return nil, ErrClosed
 	}
 }
 
 func (n *noopWatcher) Close() error {
 	n.mu.Lock()
 	defer n.mu.Unlock()
 	if n.closed {
-		return ErrWatcherClosed
+		return ErrClosed
 	}
 	n.closed = true
 	close(n.done)
diff --git a/agent/agentcontainers/watcher/watcher.go b/agent/agentcontainers/watcher/watcher.go
@@ -15,7 +15,7 @@ import (
 	"golang.org/x/xerrors"
 )
 
-var ErrWatcherClosed = xerrors.New("watcher closed")
+var ErrClosed = xerrors.New("watcher closed")
 
 // Watcher defines an interface for monitoring file system changes.
 // Implementations track file modifications and provide an event stream
@@ -140,7 +140,7 @@ func (f *fsnotifyWatcher) Next(ctx context.Context) (event *fsnotify.Event, err
 			return nil, ctx.Err()
 		case evt, ok := <-f.Events:
 			if !ok {
-				return nil, ErrWatcherClosed
+				return nil, ErrClosed
 			}
 
 			// Get the absolute path to match against our watched files.
@@ -160,11 +160,11 @@ func (f *fsnotifyWatcher) Next(ctx context.Context) (event *fsnotify.Event, err
 
 		case err, ok := <-f.Errors:
 			if !ok {
-				return nil, ErrWatcherClosed
+				return nil, ErrClosed
 			}
 			return nil, xerrors.Errorf("watcher error: %w", err)
 		case <-f.done:
-			return nil, ErrWatcherClosed
+			return nil, ErrClosed
 		}
 	}
 }
@@ -178,7 +178,7 @@ func (f *fsnotifyWatcher) Close() (err error) {
 	f.mu.Unlock()
 
 	if closed {
-		return ErrWatcherClosed
+		return ErrClosed
 	}
 
 	close(f.done)

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ func (api *API) start() {`
`152`	`152`	`for {`
`153`	`153`	`event, err := api.watcher.Next(api.ctx)`
`154`	`154`	`if err != nil {`
`155`		`- if errors.Is(err, watcher.ErrWatcherClosed) {`
	`155`	`+ if errors.Is(err, watcher.ErrClosed) {`
`156`	`156`	`api.logger.Debug(api.ctx, "watcher closed")`
`157`	`157`	`return`
`158`	`158`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,15 +32,15 @@ func (n noopWatcher) Next(ctx context.Context) (fsnotify.Event, error) {`
`32`	`32`	`case <-ctx.Done():`
`33`	`33`	`return nil, ctx.Err()`
`34`	`34`	`case <-n.done:`
`35`		`- return nil, ErrWatcherClosed`
	`35`	`+ return nil, ErrClosed`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`func (n *noopWatcher) Close() error {`
`40`	`40`	`n.mu.Lock()`
`41`	`41`	`defer n.mu.Unlock()`
`42`	`42`	`if n.closed {`
`43`		`- return ErrWatcherClosed`
	`43`	`+ return ErrClosed`
`44`	`44`	`}`
`45`	`45`	`n.closed = true`
`46`	`46`	`close(n.done)`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import (`
`15`	`15`	`"golang.org/x/xerrors"`
`16`	`16`	`)`
`17`	`17`
`18`		`-var ErrWatcherClosed = xerrors.New("watcher closed")`
	`18`	`+var ErrClosed = xerrors.New("watcher closed")`
`19`	`19`
`20`	`20`	`// Watcher defines an interface for monitoring file system changes.`
`21`	`21`	`// Implementations track file modifications and provide an event stream`
`@@ -140,7 +140,7 @@ func (f fsnotifyWatcher) Next(ctx context.Context) (event fsnotify.Event, err`
`140`	`140`	`return nil, ctx.Err()`
`141`	`141`	`case evt, ok := <-f.Events:`
`142`	`142`	`if !ok {`
`143`		`- return nil, ErrWatcherClosed`
	`143`	`+ return nil, ErrClosed`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`// Get the absolute path to match against our watched files.`
`@@ -160,11 +160,11 @@ func (f fsnotifyWatcher) Next(ctx context.Context) (event fsnotify.Event, err`
`160`	`160`
`161`	`161`	`case err, ok := <-f.Errors:`
`162`	`162`	`if !ok {`
`163`		`- return nil, ErrWatcherClosed`
	`163`	`+ return nil, ErrClosed`
`164`	`164`	`}`
`165`	`165`	`return nil, xerrors.Errorf("watcher error: %w", err)`
`166`	`166`	`case <-f.done:`
`167`		`- return nil, ErrWatcherClosed`
	`167`	`+ return nil, ErrClosed`
`168`	`168`	`}`
`169`	`169`	`}`
`170`	`170`	`}`
`@@ -178,7 +178,7 @@ func (f *fsnotifyWatcher) Close() (err error) {`
`178`	`178`	`f.mu.Unlock()`
`179`	`179`
`180`	`180`	`if closed {`
`181`		`- return ErrWatcherClosed`
	`181`	`+ return ErrClosed`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`close(f.done)`