mirror/rogueserver
1
0
Fork 0
mirror of https://github.com/pagefaultgames/rogueserver.git synced 2025-04-02 02:57:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Clean up S3 migration code by removing unnecessary blank lines and improving logging messages

Browse Source
This commit is contained in:
Frederico Santos 2024-10-17 00:51:26 +01:00
parent 51b5332d21
commit 3dd39e89ef
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/daily/common.go
View File

@ -124,7 +124,6 @@ func deriveSeed(seedTime time.Time) []byte {
} }
func S3SaveMigration() { func S3SaveMigration() {
cfg, _ := config.LoadDefaultConfig(context.TODO()) cfg, _ := config.LoadDefaultConfig(context.TODO())
svc := s3.NewFromConfig(cfg, func(o *s3.Options) { svc := s3.NewFromConfig(cfg, func(o *s3.Options) {
@ -138,6 +137,7 @@ func S3SaveMigration() {
if err != nil { if err != nil {
log.Printf("error while creating bucket: %s", err) log.Printf("error while creating bucket: %s", err)
} }
accounts := db.RetrieveOldAccounts() accounts := db.RetrieveOldAccounts()
for _, user := range accounts { for _, user := range accounts {
data, _ := db.ReadSystemSaveData(user) data, _ := db.ReadSystemSaveData(user)
@ -148,10 +148,12 @@ func S3SaveMigration() {
Key: aws.String(username), Key: aws.String(username),
Body: bytes.NewReader(json), Body: bytes.NewReader(json),
}) })
if err != nil { if err != nil {
log.Printf("error while saving data in s3 for user %s: %s", username, err) log.Printf("error while saving data in s3 for user %s: %s", username, err)
continue continue
} }
fmt.Printf("Saved data in s3 for user %s\n", username) fmt.Printf("Saved data in s3 for user %s\n", username)
db.UpdateLocation(user, username) db.UpdateLocation(user, username)
} }

3
db/savedata.go
View File

@ -246,11 +246,11 @@ func RetrieveSystemSaveFromS3(uuid []byte) error {
json.NewDecoder(resp.Body).Decode(&session) json.NewDecoder(resp.Body).Decode(&session)
err = StoreSystemSaveData(uuid, session) err = StoreSystemSaveData(uuid, session)
if err != nil { if err != nil {
fmt.Printf("Failed to store system save data from s3 for user %s\n", username) fmt.Printf("Failed to store system save data from s3 for user %s\n", username)
return err return err
} }
fmt.Printf("Retrieved system save data from s3 for user %s\n", username) fmt.Printf("Retrieved system save data from s3 for user %s\n", username)
_, err = handle.Exec("UPDATE accounts SET isInLocalDb = 1 WHERE uuid = ?", uuid) _, 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"), Bucket: aws.String("pokerogue-system"),
Key: aws.String(username), Key: aws.String(username),
}) })
if err != nil { if err != nil {
fmt.Printf("Failed to delete object %s from s3: %s\n", username, err) fmt.Printf("Failed to delete object %s from s3: %s\n", username, err)
} }