From 8ba3c3fbc0784efd7eefd93a0944927834e80c9e Mon Sep 17 00:00:00 2001
From: Ash Keel <ash@nebula.cafe>
Date: Wed, 2 Feb 2022 18:10:34 +0100
Subject: [PATCH] Cleanups

---
 main.go                      |  7 +++++-
 modules/loyalty/migration.go | 47 ------------------------------------
 2 files changed, 6 insertions(+), 48 deletions(-)
 delete mode 100644 modules/loyalty/migration.go

diff --git a/main.go b/main.go
index 84fcd2f..ae9d9ce 100644
--- a/main.go
+++ b/main.go
@@ -93,7 +93,9 @@ func main() {
 		}
 		logger, _ = cfg.Build()
 	}
-	defer logger.Sync()
+	defer func() {
+		_ = logger.Sync()
+	}()
 	undo := zap.RedirectStdLog(logger)
 	defer undo()
 
@@ -120,6 +122,9 @@ func main() {
 	case "badger":
 		var db *badger.DB
 		db, hub, err = makeBadgerHub(options)
+		if err != nil {
+			logger.Fatal("failed to open database", zap.Error(err))
+		}
 		defer func() {
 			if err := badgerClose(db); err != nil {
 				logger.Fatal("Failed to close database", zap.Error(err))
diff --git a/modules/loyalty/migration.go b/modules/loyalty/migration.go
deleted file mode 100644
index 5fb26a9..0000000
--- a/modules/loyalty/migration.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package loyalty
-
-import (
-	"errors"
-
-	kv "github.com/strimertul/kilovolt/v8"
-
-	"github.com/strimertul/strimertul/modules/database"
-
-	"go.uber.org/zap"
-)
-
-const OldPointsKey = "loyalty/users"
-
-type OldPointStorage map[string]int64
-
-func migratePoints(db *database.DBModule, log *zap.Logger) error {
-	// Retrieve old storage
-	var oldStorage OldPointStorage
-	err := db.GetJSON(OldPointsKey, &oldStorage)
-	if errors.Is(err, kv.ErrorKeyNotFound) {
-		// No migration needed, points are already kaput
-		return nil
-	}
-	if err != nil {
-		return err
-	}
-
-	// Move to new format
-	newStorage := make(map[string]interface{})
-	for user, points := range oldStorage {
-		userkey := PointsPrefix + user
-		newStorage[userkey] = PointsEntry{
-			Points: points,
-		}
-	}
-
-	// Bulk add to database
-	if err := db.PutJSONBulk(newStorage); err != nil {
-		return err
-	}
-
-	log.Info("Migrated to new loyalty point format")
-
-	// Remove old key
-	return db.RemoveKey(OldPointsKey)
-}