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

lib/model: Refactor progressEmitter to de-/activate by config (fixes #4613) (#5623)

Browse Source
This commit is contained in:
Simon Frei
2019-04-13 14:20:51 +02:00
committed by GitHub
parent 8a4b65b937
commit 3bea59b0d9
4 changed files with 152 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/model/folder_sendrecv.go
View File

@@ -1201,9 +1201,7 @@ func (f *sendReceiveFolder) copierRoutine(in <-chan copyBlocksState, pullChan ch
continue
}
if f.model.progressEmitter != nil {
f.model.progressEmitter.Register(state.sharedPullerState)
}
f.model.progressEmitter.Register(state.sharedPullerState)
folderFilesystems := make(map[string]fs.Filesystem)
var folders []string
@@ -1550,9 +1548,7 @@ func (f *sendReceiveFolder) finisherRoutine(in <-chan *sharedPullerState, dbUpda
blockStatsMut.Unlock()
}
if f.model.progressEmitter != nil {
f.model.progressEmitter.Deregister(state)
}
f.model.progressEmitter.Deregister(state)
events.Default.Log(events.ItemFinished, map[string]interface{}{
"folder": f.folderID,