octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-01-10 10:16:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/model: Don't update ignore hash when pull fails

Browse Source 
GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/4522
This commit is contained in:
Simon Frei 2017-11-17 12:42:41 +00:00 committed by Jakob Borg
parent 5f4ed66aa1
commit 6cf01c1d30
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/model/rwfolder.go
View File

@ -239,6 +239,11 @@ func (f *sendReceiveFolder) pull(prevIgnoreHash string) (curIgnoreHash string, s
return prevIgnoreHash, true return prevIgnoreHash, true
} }
if err := f.CheckHealth(); err != nil {
l.Debugln("Skipping pull of", f.Description(), "due to folder error:", err)
return prevIgnoreHash, true
}
f.model.fmut.RLock() f.model.fmut.RLock()
curIgnores := f.model.folderIgnores[f.folderID] curIgnores := f.model.folderIgnores[f.folderID]
f.model.fmut.RUnlock() f.model.fmut.RUnlock()
@ -246,11 +251,6 @@ func (f *sendReceiveFolder) pull(prevIgnoreHash string) (curIgnoreHash string, s
curIgnoreHash = curIgnores.Hash() curIgnoreHash = curIgnores.Hash()
ignoresChanged := curIgnoreHash != prevIgnoreHash ignoresChanged := curIgnoreHash != prevIgnoreHash
if err := f.CheckHealth(); err != nil {
l.Debugln("Skipping pull of", f.Description(), "due to folder error:", err)
return curIgnoreHash, true
}
l.Debugln(f, "pulling") l.Debugln(f, "pulling")
f.setState(FolderSyncing) f.setState(FolderSyncing)
@ -294,7 +294,11 @@ func (f *sendReceiveFolder) pull(prevIgnoreHash string) (curIgnoreHash string, s
f.setState(FolderIdle) f.setState(FolderIdle)
return curIgnoreHash, changed == 0 if changed == 0 {
return curIgnoreHash, true
}
return prevIgnoreHash, false
} }
// pullerIteration runs a single puller iteration for the given folder and // pullerIteration runs a single puller iteration for the given folder and