felixfoertsch/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

fix(scanner): don't warn when legitimately skipping a directory (#9911)

Browse Source 
Such as ignored directories etc.
This commit is contained in:
Jakob Borg
2025-01-09 18:42:18 +00:00
committed by GitHub
parent d324b2ac86
commit 0c1df81ee9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/scanner/walk.go
+2 -2
View File
@@ -243,7 +243,7 @@ const walkFailureEventDesc = "Unexpected error while walking the filesystem duri
func (w *walker) scan(ctx context.Context, toHashChan chan<- protocol.FileInfo, finishedChan chan<- ScanResult) { func (w *walker) scan(ctx context.Context, toHashChan chan<- protocol.FileInfo, finishedChan chan<- ScanResult) {
hashFiles := w.walkAndHashFiles(ctx, toHashChan, finishedChan) hashFiles := w.walkAndHashFiles(ctx, toHashChan, finishedChan)
if len(w.Subs) == 0 { if len(w.Subs) == 0 {
if err := w.Filesystem.Walk(".", hashFiles); err != nil { if err := w.Filesystem.Walk(".", hashFiles); err != nil && !errors.Is(err, fs.SkipDir) {
w.EventLogger.Log(events.Failure, walkFailureEventDesc) w.EventLogger.Log(events.Failure, walkFailureEventDesc)
l.Warnf("Aborted scan due to an unexpected error: %v", err) l.Warnf("Aborted scan due to an unexpected error: %v", err)
} }
@@ -253,7 +253,7 @@ func (w *walker) scan(ctx context.Context, toHashChan chan<- protocol.FileInfo,
l.Debugf("%v: Skip walking %v as it is below a symlink", w, sub) l.Debugf("%v: Skip walking %v as it is below a symlink", w, sub)
continue continue
} }
if err := w.Filesystem.Walk(sub, hashFiles); err != nil { if err := w.Filesystem.Walk(sub, hashFiles); err != nil && !errors.Is(err, fs.SkipDir) {
w.EventLogger.Log(events.Failure, walkFailureEventDesc) w.EventLogger.Log(events.Failure, walkFailureEventDesc)
l.Warnf("Aborted scan of path '%v' due to an unexpected error: %v", sub, err) l.Warnf("Aborted scan of path '%v' due to an unexpected error: %v", sub, err)
} }