Refactor

Author: Swan

azure/azure.go

@@ -75,7 +75,7 @@ func (c *StorageClient) UploadFile(container string, fileName string, data []byt
 }
 
 // UploadFileFromDisk Uploads a file to azure from disk
-func (c *StorageClient) UploadFileFromDisk(container string, name string, path string, progress pipeline.ProgressReceiver) error {
+func (c *StorageClient) UploadFileFromDisk(container string, name string, path string, tier azblob.AccessTierType) error {
 	containerURL := c.createContainerURL(container)
 	blobURL := containerURL.NewBlockBlobURL(name)
 	ctx := context.WithoutCancel(context.Background())
@@ -89,9 +89,9 @@ func (c *StorageClient) UploadFileFromDisk(container string, name string, path s
 	defer file.Close()
 
 	_, err = azblob.UploadFileToBlockBlob(ctx, file, blobURL, azblob.UploadToBlockBlobOptions{
-		BlockSize:   4 * 1024 * 1024,
-		Parallelism: 16,
-		Progress:    progress,
+		BlockSize:      4 * 1024 * 1024,
+		Parallelism:    16,
+		BlobAccessTier: tier,
 	})
 
 	if err != nil {

cmd/console/commands/database_backup.go

@@ -3,6 +3,7 @@ package commands
 import (
 	"bytes"
 	"fmt"
+	"github.com/Azure/azure-storage-blob-go/azblob"
 	"github.com/Quaver/api2/azure"
 	"github.com/Quaver/api2/config"
 	"github.com/Quaver/api2/webhooks"
@@ -23,49 +24,37 @@ var DatabaseBackupCmd = &cobra.Command{
 	Use:   "backup:database",
 	Short: "Backs up the database and uploads to azure",
 	Run: func(cmd *cobra.Command, args []string) {
-		currentTime := time.Now()
-
 		if err := deletePreviousBackups(); err != nil {
 			logrus.Error(err)
+			_ = webhooks.SendBackupWebhook(false, err)
 			return
 		}
 
 		backupDir := fmt.Sprintf("%v/backups", config.Instance.Cache.DataDirectory)
+		path, _ := filepath.Abs(fmt.Sprintf("%v/backup.sql", backupDir))
 
 		if err := os.MkdirAll(backupDir, os.ModePerm); err != nil {
 			logrus.Error("[Database Backup] Error creating backup directory", err)
 			_ = webhooks.SendBackupWebhook(false, err)
 			return
 		}
 
-		path, _ := filepath.Abs(fmt.Sprintf("%v/backup.sql", backupDir))
-
 		if err := os.Remove(path); err != nil {
 			logrus.Error("[Database Backup] Error deleting existing backup")
 		}
 
-		logrus.Info("[Database Backup] Dumping database...")
-
 		if err := dumpDatabase(path); err != nil {
 			logrus.Error("[Database Backup] Error dumping database: ", err)
 			_ = webhooks.SendBackupWebhook(false, err)
 			return
 		}
 
-		logrus.Info("[Database Backup] Finished dumping database at path: ", path)
-		logrus.Info("[Database Backup] Uploading to azure...: ", path)
-
-		fileName := fmt.Sprintf("%d-%d-%d-time-%d-%d.sql", currentTime.Year(), currentTime.Month(), currentTime.Day(), currentTime.Hour(), currentTime.Minute())
-
-		err := azure.Client.UploadFileFromDisk(databaseBackupContainer, fileName, path, nil)
-
-		if err != nil {
+		if err := uploadToAzure(path); err != nil {
 			logrus.Error("[Database Backup] Error uploading database backup", err)
 			_ = webhooks.SendBackupWebhook(false, err)
 			return
 		}
 
-		logrus.Info("[Database Backup] Database backup complete!")
 		_ = webhooks.SendBackupWebhook(true)
 	},
 }
@@ -90,6 +79,8 @@ func deletePreviousBackups() error {
 }
 
 func dumpDatabase(path string) error {
+	logrus.Info("[Database Backup] Dumping database...")
+
 	hostSplit := strings.Split(config.Instance.SQL.Host, ":")
 
 	cmd := exec.Command(
@@ -117,5 +108,23 @@ func dumpDatabase(path string) error {
 		return fmt.Errorf("%v\n\n```%v```", err, stderr.String())
 	}
 
+	logrus.Info("[Database Backup] Finished dumping database at path: ", path)
+	return nil
+}
+
+func uploadToAzure(path string) error {
+	logrus.Info("[Database Backup] Uploading to azure...:")
+
+	currentTime := time.Now()
+
+	fileName := fmt.Sprintf("%d-%d-%d-time-%d-%d.sql", currentTime.Year(), currentTime.Month(), currentTime.Day(), currentTime.Hour(), currentTime.Minute())
+
+	err := azure.Client.UploadFileFromDisk(databaseBackupContainer, fileName, path, azblob.AccessTierHot)
+
+	if err != nil {
+		return err
+	}
+
+	logrus.Info("[Database Backup] Finished uploading to azure!")
 	return nil
 }