perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/scanner, lib/model: File -> item when logging error (#5664)

Browse Source
This commit is contained in:
Simon Frei 2019-04-21 17:19:59 +02:00 committed by Audrius Butkevicius
parent 86e72d9973
commit 926e9228ed
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/model/folder_sendrecv.go
View File

@ -1747,7 +1747,7 @@ func (f *sendReceiveFolder) newPullError(path string, err error) {
return return
} }
l.Infof("Puller (folder %s, file %q): %v", f.Description(), path, err) l.Infof("Puller (folder %s, item %q): %v", f.Description(), path, err)
// Establish context to differentiate from errors while scanning. // Establish context to differentiate from errors while scanning.
// Use "syncing" as opposed to "pulling" as the latter might be used // Use "syncing" as opposed to "pulling" as the latter might be used

2
lib/scanner/walk.go
View File

@ -530,7 +530,7 @@ func (w *walker) handleError(ctx context.Context, context, path string, err erro
if fs.IsNotExist(err) { if fs.IsNotExist(err) {
return return
} }
l.Infof("Scanner (folder %s, file %q): %s: %v", w.Folder, path, context, err) l.Infof("Scanner (folder %s, item %q): %s: %v", w.Folder, path, context, err)
select { select {
case finishedChan <- ScanResult{ case finishedChan <- ScanResult{
Err: fmt.Errorf("%s: %s", context, err.Error()), Err: fmt.Errorf("%s: %s", context, err.Error()),