🎨 Data sync supports the multi-kernel online perception https://github.com/siyuan-note/siyuan/issues/8518

This commit is contained in:
Daniel 2023-06-12 20:04:24 +08:00
parent 18985de1e5
commit 5e041d9017
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
4 changed files with 8 additions and 8 deletions

View file

@ -1092,7 +1092,7 @@ func bootSyncRepo() (err error) {
if 0 < len(fetchedFiles) {
go func() {
syncErr := syncRepo(false, false)
_, syncErr := syncRepo(false, false)
if nil != err {
logging.LogErrorf("boot background sync repo failed: %s", syncErr)
return
@ -1102,7 +1102,7 @@ func bootSyncRepo() (err error) {
return
}
func syncRepo(exit, byHand bool) (err error) {
func syncRepo(exit, byHand bool) (mergeResult *dejavu.MergeResult, err error) {
if 1 > len(Conf.Repo.Key) {
autoSyncErrCount++
planSyncAfter(fixSyncInterval)