octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-11-14 01:04:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/model: Fix incorrect locking (#5939)

Browse Source
This commit is contained in:
Simon Frei 2019-08-11 16:10:30 +02:00 committed by Jakob Borg
parent 58ef5368f8
commit 4a619e74f2
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/model/model.go
View File

@ -597,10 +597,8 @@ func (info ConnectionInfo) MarshalJSON() ([]byte, error) {
// ConnectionStats returns a map with connection statistics for each device. // ConnectionStats returns a map with connection statistics for each device.
func (m *model) ConnectionStats() map[string]interface{} { func (m *model) ConnectionStats() map[string]interface{} {
m.fmut.RLock()
m.pmut.RLock() m.pmut.RLock()
defer m.pmut.RUnlock() defer m.pmut.RUnlock()
defer m.fmut.RUnlock()
res := make(map[string]interface{}) res := make(map[string]interface{})
devs := m.cfg.Devices() devs := m.cfg.Devices()
@ -1654,9 +1652,9 @@ func (m *model) recheckFile(deviceID protocol.DeviceID, folderFs fs.Filesystem,
// to what we have in the database, yet the content we've read off the filesystem doesn't // to what we have in the database, yet the content we've read off the filesystem doesn't
// Something is fishy, invalidate the file and rescan it. // Something is fishy, invalidate the file and rescan it.
// The file will temporarily become invalid, which is ok as the content is messed up. // The file will temporarily become invalid, which is ok as the content is messed up.
m.fmut.Lock() m.fmut.RLock()
runner, ok := m.folderRunners[folder] runner, ok := m.folderRunners[folder]
m.fmut.Unlock() m.fmut.RUnlock()
if !ok { if !ok {
l.Debugf("%v recheckFile: %s: %q / %q: Folder stopped before rescan could be scheduled", m, deviceID, folder, name) l.Debugf("%v recheckFile: %s: %q / %q: Folder stopped before rescan could be scheduled", m, deviceID, folder, name)
return return