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

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4376

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)