Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 07:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 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-11 23:30:16 +08:00
parent 49499e13b6
commit 529b14f8a8
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
kernel/model/sync.go
View file

@ -136,7 +136,9 @@ func SyncDataJob() {
func BootSyncData() { func BootSyncData() {
defer logging.Recover() defer logging.Recover()
connectSyncWebSocket() if Conf.Sync.Perception {
connectSyncWebSocket()
}
if !checkSync(true, false, false) { if !checkSync(true, false, false) {
return return
@ -221,12 +223,12 @@ func syncData(exit, byHand, byWebSocket bool) {
} }
util.BroadcastByType("main", "syncing", code, msg, nil) util.BroadcastByType("main", "syncing", code, msg, nil)
if nil == webSocketConn { if nil == webSocketConn && Conf.Sync.Perception {
// 如果 websocket 连接已经断开，则重新连接 // 如果 websocket 连接已经断开，则重新连接
connectSyncWebSocket() connectSyncWebSocket()
} }
if 1 == Conf.Sync.Mode && !byWebSocket && nil != webSocketConn { if 1 == Conf.Sync.Mode && !byWebSocket && nil != webSocketConn && Conf.Sync.Perception {
// 如果处于自动同步模式且不是又 WS 触发的同步，则通知其他设备上的内核进行同步 // 如果处于自动同步模式且不是又 WS 触发的同步，则通知其他设备上的内核进行同步
request := map[string]interface{}{ request := map[string]interface{}{
"cmd": "synced", "cmd": "synced",