felixfoertsch/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

chore(stdiscosrv): path style s3

Browse Source
This commit is contained in:
Jakob Borg
2025-04-13 09:40:14 +02:00
parent 8b6d837483
commit c74299b59a
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/stdiscosrv/database.go
+3 -3
View File
@@ -74,16 +74,16 @@ func newInMemoryStore(dir string, flushInterval time.Duration, s3sess *s3.Sessio
// Try to read from AWS // Try to read from AWS
latestKey, cerr := s3sess.LatestKey() latestKey, cerr := s3sess.LatestKey()
if cerr != nil { if cerr != nil {
log.Println("Error reading database from S3:", err) log.Println("Error finding database from S3:", cerr)
return s return s
} }
fd, cerr := os.Create(path.Join(s.dir, "records.db")) fd, cerr := os.Create(path.Join(s.dir, "records.db"))
if cerr != nil { if cerr != nil {
log.Println("Error creating database file:", err) log.Println("Error creating database file:", cerr)
return s return s
} }
if cerr := s3sess.Download(fd, latestKey); cerr != nil { if cerr := s3sess.Download(fd, latestKey); cerr != nil {
log.Printf("Error reading database from S3: %v", err) log.Printf("Error downloading database from S3: %v", cerr)
} }
_ = fd.Close() _ = fd.Close()
nr, err = s.read() nr, err = s.read()
lib/s3/s3.go
+4 -3
View File
@@ -26,9 +26,10 @@ type Object = s3.Object
func NewSession(endpoint, region, bucket, accessKeyID, secretKey string) (*Session, error) { func NewSession(endpoint, region, bucket, accessKeyID, secretKey string) (*Session, error) {
sess, err := session.NewSession(&aws.Config{ sess, err := session.NewSession(&aws.Config{
Region: aws.String(region), Region: aws.String(region),
Endpoint: aws.String(endpoint), Endpoint: aws.String(endpoint),
Credentials: credentials.NewStaticCredentials(accessKeyID, secretKey, ""), Credentials: credentials.NewStaticCredentials(accessKeyID, secretKey, ""),
S3ForcePathStyle: aws.Bool(true),
}) })
if err != nil { if err != nil {
return nil, err return nil, err