perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add version to LocalIndexUpdate event.

Browse Source 
Allows correlating LocalIndexUpdate events on one device with RemoteIndexUpdated on another to make sure the cluster has converged.
This commit is contained in:
Jakob Borg 2015-06-16 08:30:15 +02:00
parent a6d9150b14
commit 127b0c3332
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
internal/model/model.go
View File

@ -1123,8 +1123,10 @@ func sendIndexTo(initial bool, minLocalVer int64, conn protocol.Connection, fold
func (m *Model) updateLocals(folder string, fs []protocol.FileInfo) { func (m *Model) updateLocals(folder string, fs []protocol.FileInfo) {
m.fmut.RLock() m.fmut.RLock()
m.folderFiles[folder].Update(protocol.LocalDeviceID, fs) files := m.folderFiles[folder]
m.fmut.RUnlock() m.fmut.RUnlock()
files.Update(protocol.LocalDeviceID, fs)
m.rvmut.Lock() m.rvmut.Lock()
for _, f := range fs { for _, f := range fs {
delete(m.reqValidationCache, folder+"/"+f.Name) delete(m.reqValidationCache, folder+"/"+f.Name)
@ -1132,8 +1134,9 @@ func (m *Model) updateLocals(folder string, fs []protocol.FileInfo) {
m.rvmut.Unlock() m.rvmut.Unlock()
events.Default.Log(events.LocalIndexUpdated, map[string]interface{}{ events.Default.Log(events.LocalIndexUpdated, map[string]interface{}{
"folder": folder, "folder": folder,
"items": len(fs), "items": len(fs),
"version": files.LocalVersion(protocol.LocalDeviceID),
}) })
} }