Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/model: Fix logging inconsistencies (fixes #4375) 

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4376
This commit is contained in:
Simon Frei 2017-09-18 11:56:19 +00:00 committed by Jakob Borg
parent f40d219370
commit 1088eb12ea
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/model/rwfolder.go
View File

@ -245,8 +245,8 @@ func (f *sendReceiveFolder) Serve() {
// errors preventing us. Flag this with a warning and // errors preventing us. Flag this with a warning and
// wait a bit longer before retrying. // wait a bit longer before retrying.
if folderErrors := f.currentErrors(); len(folderErrors) > 0 { if folderErrors := f.currentErrors(); len(folderErrors) > 0 {
for path, err := range folderErrors { for _, fileError := range folderErrors {
l.Infof("Puller (folder %q, dir %q): %v", f.Description(), path, err) l.Infof("Puller (folder %v, dir %q): %v", f.Description(), fileError.Path, fileError.Err)
} }
events.Default.Log(events.FolderErrors, map[string]interface{}{ events.Default.Log(events.FolderErrors, map[string]interface{}{
"folder": f.folderID, "folder": f.folderID,
@ -254,7 +254,7 @@ func (f *sendReceiveFolder) Serve() {
}) })
} }
l.Infof("Folder %q isn't making progress. Pausing puller for %v.", f.folderID, f.pause) l.Infof("Folder %v isn't making progress. Pausing puller for %v.", f.Description(), f.pause)
l.Debugln(f, "next pull in", f.pause) l.Debugln(f, "next pull in", f.pause)
f.pullTimer.Reset(f.pause) f.pullTimer.Reset(f.pause)