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 00:51:08 +08:00
parent e767ab73f1
commit 81946a7276
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 38 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
kernel/model/repository.go
View file

@ -541,40 +541,7 @@ func syncRepo(boot, exit, byHand bool) (err error) {
logging.LogInfof("synced data repo [ufc=%d, dfc=%d, ucc=%d, dcc=%d, ub=%s, db=%s] in [%.2fs]",
trafficStat.UploadFileCount, trafficStat.DownloadFileCount, trafficStat.UploadChunkCount, trafficStat.DownloadChunkCount, humanize.Bytes(uint64(trafficStat.UploadBytes)), humanize.Bytes(uint64(trafficStat.DownloadBytes)), elapsed.Seconds())
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{}
for i, f := range mergeResult.Conflicts {
logBuilder.WriteString(" ")
logBuilder.WriteString(f.Path)
if i < len(mergeResult.Conflicts)-1 {
logBuilder.WriteString("\n")
}
}
logging.LogInfof("sync conflicts:\n%s", logBuilder.String())
}
if 0 < len(mergeResult.Upserts) {
logBuilder := bytes.Buffer{}
for i, f := range mergeResult.Upserts {
logBuilder.WriteString(" ")
logBuilder.WriteString(f.Path)
if i < len(mergeResult.Upserts)-1 {
logBuilder.WriteString("\n")
}
}
logging.LogInfof("sync merge upserts:\n%s", logBuilder.String())
}
if 0 < len(mergeResult.Removes) {
logBuilder := bytes.Buffer{}
for i, f := range mergeResult.Removes {
logBuilder.WriteString(" ")
logBuilder.WriteString(f.Path)
if i < len(mergeResult.Removes)-1 {
logBuilder.WriteString("\n")
}
}
logging.LogInfof("sync merge removes:\n%s", logBuilder.String())
}
logSyncMergeResult(mergeResult)
if 0 < len(mergeResult.Conflicts) {
// 云端同步发生冲突时生成副本 https://github.com/siyuan-note/siyuan/issues/5687
@ -665,6 +632,43 @@ func syncRepo(boot, exit, byHand bool) (err error) {
return
}
func logSyncMergeResult(mergeResult *dejavu.MergeResult) {
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{}
for i, f := range mergeResult.Conflicts {
logBuilder.WriteString(" ")
logBuilder.WriteString(f.Path)
if i < len(mergeResult.Conflicts)-1 {
logBuilder.WriteString("\n")
}
}
logging.LogInfof("sync conflicts:\n%s", logBuilder.String())
}
if 0 < len(mergeResult.Upserts) {
logBuilder := bytes.Buffer{}
for i, f := range mergeResult.Upserts {
logBuilder.WriteString(" ")
logBuilder.WriteString(f.Path)
if i < len(mergeResult.Upserts)-1 {
logBuilder.WriteString("\n")
}
}
logging.LogInfof("sync merge upserts:\n%s", logBuilder.String())
}
if 0 < len(mergeResult.Removes) {
logBuilder := bytes.Buffer{}
for i, f := range mergeResult.Removes {
logBuilder.WriteString(" ")
logBuilder.WriteString(f.Path)
if i < len(mergeResult.Removes)-1 {
logBuilder.WriteString("\n")
}
}
logging.LogInfof("sync merge removes:\n%s", logBuilder.String())
}
}
func needFullReindex(upsertTrees int) bool {
return 0.2 < float64(upsertTrees)/float64(treenode.CountTrees())
}