From 3dd39e89ef89836a5a8a7ceb83ad0d4159d6639b Mon Sep 17 00:00:00 2001 From: Frederico Santos Date: Thu, 17 Oct 2024 00:51:26 +0100 Subject: [PATCH] fix: Clean up S3 migration code by removing unnecessary blank lines and improving logging messages --- api/daily/common.go | 4 +++- db/savedata.go | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/api/daily/common.go b/api/daily/common.go index df048e2..63353d7 100644 --- a/api/daily/common.go +++ b/api/daily/common.go @@ -124,7 +124,6 @@ func deriveSeed(seedTime time.Time) []byte { } func S3SaveMigration() { - cfg, _ := config.LoadDefaultConfig(context.TODO()) svc := s3.NewFromConfig(cfg, func(o *s3.Options) { @@ -138,6 +137,7 @@ func S3SaveMigration() { if err != nil { log.Printf("error while creating bucket: %s", err) } + accounts := db.RetrieveOldAccounts() for _, user := range accounts { data, _ := db.ReadSystemSaveData(user) @@ -148,10 +148,12 @@ func S3SaveMigration() { Key: aws.String(username), Body: bytes.NewReader(json), }) + if err != nil { log.Printf("error while saving data in s3 for user %s: %s", username, err) continue } + fmt.Printf("Saved data in s3 for user %s\n", username) db.UpdateLocation(user, username) } diff --git a/db/savedata.go b/db/savedata.go index 77dc3f6..aed1eee 100644 --- a/db/savedata.go +++ b/db/savedata.go @@ -246,11 +246,11 @@ func RetrieveSystemSaveFromS3(uuid []byte) error { json.NewDecoder(resp.Body).Decode(&session) err = StoreSystemSaveData(uuid, session) - if err != nil { fmt.Printf("Failed to store system save data from s3 for user %s\n", username) return err } + fmt.Printf("Retrieved system save data from s3 for user %s\n", username) _, err = handle.Exec("UPDATE accounts SET isInLocalDb = 1 WHERE uuid = ?", uuid) @@ -262,6 +262,7 @@ func RetrieveSystemSaveFromS3(uuid []byte) error { Bucket: aws.String("pokerogue-system"), Key: aws.String(username), }) + if err != nil { fmt.Printf("Failed to delete object %s from s3: %s\n", username, err) }