octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-09-19 21:29:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Emit info level log when deleting directory fails

Browse Source
This commit is contained in:
Jakob Borg 2014-10-10 21:20:46 +02:00
parent b2cf28efdd
commit d65302742c
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/model/puller.go
View File

@ -343,17 +343,17 @@ func (p *Puller) handleDir(file protocol.FileInfo) {
if err = osutil.InWritableDir(mkdir, realName); err == nil { if err = osutil.InWritableDir(mkdir, realName); err == nil {
p.model.updateLocal(p.folder, file) p.model.updateLocal(p.folder, file)
} else { } else {
l.Infof("Puller (folder %q, file %q): %v", p.folder, file.Name, err) l.Infof("Puller (folder %q, dir %q): %v", p.folder, file.Name, err)
} }
return return
} }
// Weird error when stat()'ing the dir. Probably won't work to do // Weird error when stat()'ing the dir. Probably won't work to do
// anything else with it if we can't even stat() it. // anything else with it if we can't even stat() it.
l.Infof("Puller (folder %q, file %q): %v", p.folder, file.Name, err) l.Infof("Puller (folder %q, dir %q): %v", p.folder, file.Name, err)
return return
} else if !info.IsDir() { } else if !info.IsDir() {
l.Infof("Puller (folder %q, file %q): should be dir, but is not", p.folder, file.Name) l.Infof("Puller (folder %q, dir %q): should be dir, but is not", p.folder, file.Name)
return return
} }
@ -366,7 +366,7 @@ func (p *Puller) handleDir(file protocol.FileInfo) {
} else if err := os.Chmod(realName, mode); err == nil { } else if err := os.Chmod(realName, mode); err == nil {
p.model.updateLocal(p.folder, file) p.model.updateLocal(p.folder, file)
} else { } else {
l.Infof("Puller (folder %q, file %q): %v", p.folder, file.Name, err) l.Infof("Puller (folder %q, dir %q): %v", p.folder, file.Name, err)
} }
} }
@ -376,6 +376,8 @@ func (p *Puller) deleteDir(file protocol.FileInfo) {
err := osutil.InWritableDir(os.Remove, realName) err := osutil.InWritableDir(os.Remove, realName)
if err == nil || os.IsNotExist(err) { if err == nil || os.IsNotExist(err) {
p.model.updateLocal(p.folder, file) p.model.updateLocal(p.folder, file)
} else {
l.Infof("Puller (folder %q, dir %q): delete: %v", p.folder, file.Name, err)
} }
} }