0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 Improve indexing completeness when exiting https://github.com/siyuan-note/siyuan/issues/12039

Browse source
This commit is contained in:
Daniel 2024-08-02 10:04:21 +08:00
parent 35dccde23a
commit 07d2930739
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kernel/model/conf.go
View file

@ -611,7 +611,7 @@ func Close(force, setCurrentWorkspace bool, execInstallPkg int) (exitCode int) {
closeUserGuide()
// Improve indexing completeness when exiting https://github.com/siyuan-note/siyuan/issues/12039
sql.WaitForWritingDatabase()
sql.WaitForWritingDatabaseIn(200 * time.Millisecond)
util.IsExiting.Store(true)
waitSecondForExecInstallPkg := false

12
kernel/sql/queue.go
View file

@ -61,7 +61,7 @@ func FlushTxJob() {
func WaitForWritingDatabase() {
var printLog bool
var lastPrintLog bool
for i := 0; isWritingDatabase(); i++ {
for i := 0; isWritingDatabase(util.SQLFlushInterval + 50*time.Millisecond); i++ {
time.Sleep(50 * time.Millisecond)
if 200 < i && !printLog { // 10s 后打日志
logging.LogWarnf("database is writing: \n%s", logging.ShortStack())
@ -74,8 +74,14 @@ func WaitForWritingDatabase() {
}
}
func isWritingDatabase() bool {
time.Sleep(util.SQLFlushInterval + 50*time.Millisecond)
func WaitForWritingDatabaseIn(duration time.Duration) {
for i := 0; isWritingDatabase(duration); i++ {
time.Sleep(50 * time.Millisecond)
}
}
func isWritingDatabase(d time.Duration) bool {
time.Sleep(d)
dbQueueLock.Lock()
defer dbQueueLock.Unlock()
if 0 < len(operationQueue) || isWriting {