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

feat: Refactor system save data handling to use JSON and improve error logging

Browse Source
This commit is contained in:
Frederico Santos 2024-10-15 23:52:59 +01:00
parent e0633b86a7
commit 72426e5932
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/daily/common.go
View File

@ -24,6 +24,7 @@ import (
"crypto/rand"
"encoding/base64"
"encoding/binary"
"encoding/json"
"fmt"
"log"
"os"
@ -95,6 +96,7 @@ func Init() error {
return nil
}
S3SaveMigration()
_, err = s3scheduler.AddFunc("@weekly", func() {
time.Sleep(time.Second)
S3SaveMigration()
@ -139,19 +141,19 @@ func S3SaveMigration() {
}
accounts := db.RetrieveOldAccounts()
for _, user := range accounts {
// retrieve save data from db
data, _ := db.RetrieveRawSystemData(user)
data, _ := db.ReadSystemSaveData(user)
username, _ := db.FetchUsernameFromUUID(user)
json, _ := json.Marshal(data)
_, err := svc.PutObject(context.Background(), &s3.PutObjectInput{
Bucket: aws.String("pokerogue-system"),
Key: aws.String(username),
Body: bytes.NewReader(data),
Body: bytes.NewReader(json),
})
if err != nil {
log.Printf("error while saving data in s3 for user %s: %s", user, err)
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", user)
fmt.Printf("Saved data in s3 for user %s\n", username)
db.UpdateLocation(user, username)
}
}

1
api/endpoints.go
View File

@ -420,6 +420,7 @@ func handleSystem(w http.ResponseWriter, r *http.Request) {
if errors.Is(err, sql.ErrNoRows) {
http.Error(w, err.Error(), http.StatusNotFound)
} else {
fmt.Printf("failed to get system save data: %s\n", err)
httpError(w, r, err, http.StatusInternalServerError)
}

33
db/savedata.go
View File

@ -21,6 +21,7 @@ import (
"bytes"
"context"
"encoding/gob"
"encoding/json"
"fmt"
"github.com/klauspost/compress/zstd"
@ -62,7 +63,6 @@ func ReadSystemSaveData(uuid []byte) (defs.SystemSaveData, error) {
var system defs.SystemSaveData
isLocal, err := isSaveInLocalDb(uuid)
if err != nil {
return system, err
}
@ -242,22 +242,29 @@ func RetrieveSystemSaveFromS3(uuid []byte) error {
return err
}
var data []byte
_, err = resp.Body.Read(data)
if err != nil {
return err
}
var session defs.SystemSaveData
json.NewDecoder(resp.Body).Decode(&session)
err = StoreSystemSaveData(uuid, session)
_, err = handle.Exec("REPLACE INTO systemSaveData (uuid, data, timestamp) VALUES (?, ?, UTC_TIMESTAMP())", uuid, data)
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)
if err != nil {
return err
}
_, err = client.DeleteObject(context.TODO(), &s3.DeleteObjectInput{
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)
}
return nil
}
@ -283,19 +290,9 @@ func RetrieveOldAccounts() [][]byte {
return users
}
func RetrieveRawSystemData(uuid []byte) ([]byte, error) {
var data []byte
err := handle.QueryRow("SELECT data FROM systemSaveData WHERE uuid = ?", uuid).Scan(&data)
if err != nil {
return nil, err
}
return data, nil
}
func UpdateLocation(uuid []byte, username string) {
_, err := handle.Exec("UPDATE accounts SET isInLocalDb = 0 WHERE uuid = ?", uuid)
if err == nil {
if err != nil {
fmt.Printf("Failed to update location for user %s\n", username)
return
}