${window.siyuan.languages.syncPerception}
${window.siyuan.languages.syncPerceptionTip}
diff --git a/kernel/model/conf.go b/kernel/model/conf.go
index 14532bb67..6ba7b505c 100644
--- a/kernel/model/conf.go
+++ b/kernel/model/conf.go
@@ -284,6 +284,9 @@ func InitConf() {
}
Conf.Sync.WebDAV.Endpoint = util.NormalizeEndpoint(Conf.Sync.WebDAV.Endpoint)
Conf.Sync.WebDAV.Timeout = util.NormalizeTimeout(Conf.Sync.WebDAV.Timeout)
+ if util.ContainerDocker == util.Container {
+ Conf.Sync.Perception = false
+ }
if nil == Conf.Api {
Conf.Api = conf.NewAPI()
diff --git a/kernel/model/sync.go b/kernel/model/sync.go
index b9f7a7513..b6732ef5c 100644
--- a/kernel/model/sync.go
+++ b/kernel/model/sync.go
@@ -372,6 +372,10 @@ func SetSyncEnable(b bool) {
}
func SetSyncPerception(b bool) {
+ if util.ContainerDocker == util.Container {
+ b = false
+ }
+
Conf.Sync.Perception = b
Conf.Save()
@@ -717,16 +721,16 @@ func connectSyncWebSocket() {
reconnected := false
for retries := 0; retries < 7; retries++ {
time.Sleep(7 * time.Second)
- logging.LogWarnf("reconnecting sync websocket...")
+ //logging.LogInfof("reconnecting sync websocket...")
webSocketConn, dialErr = dialSyncWebSocket()
if nil != dialErr {
logging.LogWarnf("reconnect sync websocket failed: %s", dialErr)
continue
- } else {
- logging.LogInfof("sync websocket reconnected")
- reconnected = true
- break
}
+
+ logging.LogInfof("sync websocket reconnected")
+ reconnected = true
+ break
}
if !reconnected {
logging.LogWarnf("reconnect sync websocket failed, do not retry")