github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-11 06:30:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Daniel 2023-06-12 08:00:39 +08:00
parent 2468c70f3b
commit 84d551bdd5
No known key found for this signature in database
GPG Key ID: 86211BA83DF03017
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/model/repository.go
View File

@ -1167,8 +1167,8 @@ func syncRepo(exit, byHand bool) (err error) {
msg := fmt.Sprintf(Conf.Language(150), trafficStat.UploadFileCount, trafficStat.DownloadFileCount, trafficStat.UploadChunkCount, trafficStat.DownloadChunkCount, humanize.Bytes(uint64(trafficStat.UploadBytes)), humanize.Bytes(uint64(trafficStat.DownloadBytes))) msg := fmt.Sprintf(Conf.Language(150), trafficStat.UploadFileCount, trafficStat.DownloadFileCount, trafficStat.UploadChunkCount, trafficStat.DownloadChunkCount, humanize.Bytes(uint64(trafficStat.UploadBytes)), humanize.Bytes(uint64(trafficStat.DownloadBytes)))
Conf.Sync.Stat = msg Conf.Sync.Stat = msg
autoSyncErrCount = 0 autoSyncErrCount = 0
logging.LogInfof("synced data repo [provider=%d, ufc=%d, dfc=%d, ucc=%d, dcc=%d, ub=%s, db=%s] in [%.2fs]", logging.LogInfof("synced data repo [kernel=%s, provider=%d, ufc=%d, dfc=%d, ucc=%d, dcc=%d, ub=%s, db=%s] in [%.2fs]",
Conf.Sync.Provider, trafficStat.UploadFileCount, trafficStat.DownloadFileCount, trafficStat.UploadChunkCount, trafficStat.DownloadChunkCount, humanize.Bytes(uint64(trafficStat.UploadBytes)), humanize.Bytes(uint64(trafficStat.DownloadBytes)), elapsed.Seconds()) kernelID, Conf.Sync.Provider, trafficStat.UploadFileCount, trafficStat.DownloadFileCount, trafficStat.UploadChunkCount, trafficStat.DownloadChunkCount, humanize.Bytes(uint64(trafficStat.UploadBytes)), humanize.Bytes(uint64(trafficStat.DownloadBytes)), elapsed.Seconds())
processSyncMergeResult(exit, byHand, start, mergeResult) processSyncMergeResult(exit, byHand, start, mergeResult)
return return

2
kernel/model/sync.go
View File

@ -689,7 +689,7 @@ func connectSyncWebSocket() {
return return
} }
logging.LogInfof("connecting sync websocket...") //logging.LogInfof("connecting sync websocket...")
var dialErr error var dialErr error
webSocketConn, dialErr = dialSyncWebSocket() webSocketConn, dialErr = dialSyncWebSocket()
if nil != dialErr { if nil != dialErr {