[common-go] continue on hashConfig errors (#20752)

kylos101 · web-flow · commit e5b9a3c59f65 · 2025-04-16T12:43:15.000-04:00
* Log the event name when hashConfig fails * [common-go] backoff and retry watching files * Revert "[common-go] backoff and retry watching files" This reverts commit e43e0d8. * Continue watching, after hashConfig error This way, subsequent changes to the watched file may be honored
diff --git a/components/common-go/watch/file.go b/components/common-go/watch/file.go
@@ -85,8 +85,8 @@ func File(ctx context.Context, path string, onChange func()) error {
 
 				currentHash, err := hashConfig(path)
 				if err != nil {
-					log.WithError(err).Warn("Cannot check if config has changed")
-					return
+					log.WithError(err).WithField("event", event.Name).Warn("Cannot check if config has changed")
+					continue
 				}
 
 				// no change

Original file line number	Diff line number	Diff line change
`@@ -85,8 +85,8 @@ func File(ctx context.Context, path string, onChange func()) error {`
`85`	`85`
`86`	`86`	`currentHash, err := hashConfig(path)`
`87`	`87`	`if err != nil {`
`88`		`- log.WithError(err).Warn("Cannot check if config has changed")`
`89`		`- return`
	`88`	`+ log.WithError(err).WithField("event", event.Name).Warn("Cannot check if config has changed")`
	`89`	`+ continue`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`// no change`