Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-29 19:56:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 Improve S3/WebDAV data sync config https://github.com/siyuan-note/siyuan/issues/12923

Browse source
This commit is contained in:
Daniel 2024-10-26 22:41:58 +08:00
parent e25e8042ba
commit b32257cf1c
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
16 changed files with 648 additions and 622 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/model/conf.go
View file

@ -339,7 +339,7 @@ func InitConf() {
Conf.Sync.Mode = 1
}
if nil == Conf.Sync.S3 {
Conf.Sync.S3 = &conf.S3{SkipTlsVerify: true}
Conf.Sync.S3 = &conf.S3{PathStyle: true, SkipTlsVerify: true}
}
Conf.Sync.S3.Endpoint = util.NormalizeEndpoint(Conf.Sync.S3.Endpoint)
Conf.Sync.S3.Timeout = util.NormalizeTimeout(Conf.Sync.S3.Timeout)

4
kernel/model/sync.go
View file

@ -584,6 +584,10 @@ func formatRepoErrorMsg(err error) string {
msg = Conf.Language(213)
} else if errors.Is(err, cloud.ErrCloudServiceUnavailable) {
msg = Conf.language(219)
} else if errors.Is(err, cloud.ErrCloudForbidden) {
msg = Conf.language(249)
} else if errors.Is(err, cloud.ErrCloudTooManyRequests) {
msg = Conf.language(250)
} else {
logging.LogErrorf("sync failed caused by network: %s", msg)
msgLowerCase := strings.ToLower(msg)