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

🔊 细化云端同步日志

Browse source
This commit is contained in:
Liang Ding 2022-09-02 10:16:26 +08:00
parent 28e28ff1cb
commit 9645f6426c
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kernel/model/repository.go
View file

@ -633,6 +633,10 @@ func syncRepo(boot, exit, byHand bool) (err error) {
}
func logSyncMergeResult(mergeResult *dejavu.MergeResult) {
if 1 > len(mergeResult.Conflicts) && 1 > len(mergeResult.Upserts) && 1 > len(mergeResult.Removes) {
return
}
logging.LogInfof("sync merge result [conflicts=%d, upserts=%d, removes=%d]", len(mergeResult.Conflicts), len(mergeResult.Upserts), len(mergeResult.Removes))
if 0 < len(mergeResult.Conflicts) {
logBuilder := bytes.Buffer{}