0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 Improve WebDAV/S3 data sync request timeout settings https://github.com/siyuan-note/siyuan/issues/12734

Browse source
This commit is contained in:
Daniel 2024-10-08 17:06:13 +08:00
parent 61e07a1ed1
commit e334478214
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kernel/bazaar/package.go
View file

@ -484,7 +484,7 @@ func isOutdatedTemplate(template *Template, bazaarTemplates []*Template) bool {
func isBazzarOnline() (ret bool) {
// Improve marketplace loading when offline https://github.com/siyuan-note/siyuan/issues/12050
ret = util.IsOnline(util.BazaarOSSServer, true)
ret = util.IsOnline(util.BazaarOSSServer, true, 3000)
if !ret {
util.PushErrMsg(util.Langs[util.Lang][24], 5000)
}

5
kernel/model/sync.go
View file

@ -648,20 +648,23 @@ func planSyncAfter(d time.Duration) {
func isProviderOnline(byHand bool) (ret bool) {
checkURL := util.GetCloudSyncServer()
skipTlsVerify := false
timeout := 3000
switch Conf.Sync.Provider {
case conf.ProviderSiYuan:
case conf.ProviderS3:
checkURL = Conf.Sync.S3.Endpoint
skipTlsVerify = Conf.Sync.S3.SkipTlsVerify
timeout = Conf.Sync.S3.Timeout * 1000
case conf.ProviderWebDAV:
checkURL = Conf.Sync.WebDAV.Endpoint
skipTlsVerify = Conf.Sync.WebDAV.SkipTlsVerify
timeout = Conf.Sync.WebDAV.Timeout * 1000
default:
logging.LogWarnf("unknown provider: %d", Conf.Sync.Provider)
return false
}
if ret = util.IsOnline(checkURL, skipTlsVerify); !ret {
if ret = util.IsOnline(checkURL, skipTlsVerify, timeout); !ret {
if 1 > autoSyncErrCount || byHand {
util.PushErrMsg(Conf.Language(76)+" (Provider: "+conf.ProviderToStr(Conf.Sync.Provider)+")", 5000)
}

8
kernel/util/net.go
View file

@ -72,7 +72,7 @@ func IsLocalOrigin(origin string) bool {
return false
}
func IsOnline(checkURL string, skipTlsVerify bool) bool {
func IsOnline(checkURL string, skipTlsVerify bool, timeout int) bool {
_, err := url.Parse(checkURL)
if err != nil {
logging.LogWarnf("invalid check URL [%s]", checkURL)
@ -83,7 +83,7 @@ func IsOnline(checkURL string, skipTlsVerify bool) bool {
return false
}
if isOnline(checkURL, skipTlsVerify) {
if isOnline(checkURL, skipTlsVerify, timeout) {
return true
}
@ -104,8 +104,8 @@ func IsPortOpen(port string) bool {
return false
}
func isOnline(checkURL string, skipTlsVerify bool) (ret bool) {
c := req.C().SetTimeout(3 * time.Second)
func isOnline(checkURL string, skipTlsVerify bool, timeout int) (ret bool) {
c := req.C().SetTimeout(time.Duration(timeout) * time.Millisecond)
if skipTlsVerify {
c.EnableInsecureSkipVerify()
}