Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 15:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 潜在的备份锁文件问题 https://ld246.com/article/1655253842949

Browse source
This commit is contained in:
Liang Ding 2022-06-15 11:02:34 +08:00
parent 120964fbba
commit 1db705b6c6
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
kernel/model/backup.go
View file

@ -252,8 +252,10 @@ func CreateLocalBackup() (err error) {
defer util.ClearPushProgress(100) defer util.ClearPushProgress(100)
util.PushEndlessProgress(Conf.Language(22)) util.PushEndlessProgress(Conf.Language(22))
writingDataLock.Lock()
defer writingDataLock.Unlock()
WaitForWritingFiles() WaitForWritingFiles()
sql.WaitForWritingDatabase()
filesys.ReleaseAllFileLocks() filesys.ReleaseAllFileLocks()
util.LogInfof("creating backup...") util.LogInfof("creating backup...")

4
kernel/model/repository.go
View file

@ -192,14 +192,12 @@ func IndexRepo(memo string) (err error) {
return return
} }
util.PushEndlessProgress(Conf.Language(143))
writingDataLock.Lock() writingDataLock.Lock()
defer writingDataLock.Unlock() defer writingDataLock.Unlock()
util.PushEndlessProgress(Conf.Language(143))
WaitForWritingFiles() WaitForWritingFiles()
sql.WaitForWritingDatabase() sql.WaitForWritingDatabase()
filesys.ReleaseAllFileLocks() filesys.ReleaseAllFileLocks()
CloseWatchAssets()
defer WatchAssets()
_, err = repo.Index(memo, util.PushEndlessProgress, indexCallbacks) _, err = repo.Index(memo, util.PushEndlessProgress, indexCallbacks)
util.PushClearProgress() util.PushClearProgress()