From d5b5c082fbb68fa122e64c0d627d6e93b413dc4a Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Wed, 29 Mar 2023 15:07:13 +0800 Subject: [PATCH] :art: Use `Endpoint` for network connectivity checks when syncing with third-party cloud providers https://github.com/siyuan-note/siyuan/issues/7805 --- kernel/model/sync.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/kernel/model/sync.go b/kernel/model/sync.go index 296fd3c56..f1cde1ade 100644 --- a/kernel/model/sync.go +++ b/kernel/model/sync.go @@ -567,18 +567,19 @@ func planSyncAfter(d time.Duration) { } func isProviderOnline() (ret bool) { + checkURL := util.SiYuanSyncServer switch Conf.Sync.Provider { case conf.ProviderSiYuan: - ret = util.IsOnline(util.SiYuanSyncServer) case conf.ProviderS3: - ret = util.IsOnline(Conf.Sync.S3.Endpoint) + checkURL = Conf.Sync.S3.Endpoint case conf.ProviderWebDAV: - ret = util.IsOnline(Conf.Sync.WebDAV.Endpoint) + checkURL = Conf.Sync.WebDAV.Endpoint default: - ret = util.IsOnline("") + logging.LogWarnf("unknown provider: %d", Conf.Sync.Provider) + util.IsOnline("") } - if !ret { + if ret = util.IsOnline(checkURL); !ret { util.PushErrMsg(Conf.Language(76), 5000) } return