From 1088eb12ea4982f7402feb603b0914c1406a45e9 Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Mon, 18 Sep 2017 11:56:19 +0000 Subject: [PATCH] lib/model: Fix logging inconsistencies (fixes #4375) GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4376 --- lib/model/rwfolder.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/model/rwfolder.go b/lib/model/rwfolder.go index 30996323e..f84d2c2f7 100644 --- a/lib/model/rwfolder.go +++ b/lib/model/rwfolder.go @@ -245,8 +245,8 @@ func (f *sendReceiveFolder) Serve() { // errors preventing us. Flag this with a warning and // wait a bit longer before retrying. if folderErrors := f.currentErrors(); len(folderErrors) > 0 { - for path, err := range folderErrors { - l.Infof("Puller (folder %q, dir %q): %v", f.Description(), path, err) + for _, fileError := range folderErrors { + l.Infof("Puller (folder %v, dir %q): %v", f.Description(), fileError.Path, fileError.Err) } events.Default.Log(events.FolderErrors, map[string]interface{}{ "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) f.pullTimer.Reset(f.pause)