Changed CopyObject with ComposeObject for multipart

monobilisim · Mar 5, 2024 · b40359c · b40359c
1 parent 32afaa7
commit b40359c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/backup/minio.go b/backup/minio.go
@@ -72,7 +72,7 @@ func newMinioClient(endpoint, accessKey, secretKey string, secure, insecureSkipV
 	return &c, nil
 }
 
-func uploadFileToMinio(minioClient *MinioClient, rotation config.Rotation, db string, src string, bucketName string, dst string, minio_dst string) error {
+func uploadFileToMinio(minioClient *MinioClient, rotation config.Rotation, db string, src string, bucketName string, dst string, minioDst string) error {
 	src = strings.TrimSuffix(src, "/")
 	_, err := os.Open(src)
 	if err != nil {
@@ -93,9 +93,9 @@ func uploadFileToMinio(minioClient *MinioClient, rotation config.Rotation, db st
 			name = name + "." + extension[len(extension)-1]
 			dest := minio.CopyDestOptions{
 				Bucket: bucketName,
-				Object: minio_dst + "/" + name,
+				Object: minioDst + "/" + name,
 			}
-			_, err := minioClient.CopyObject(context.Background(), dest, source)
+			_, err := minioClient.ComposeObject(context.Background(), dest, source)
 			if err != nil {
 				return errors.New("Couldn't create copy for rotation. Error: " + err.Error())
 			}

diff --git a/backup/mysql.go b/backup/mysql.go
@@ -43,6 +43,7 @@ func dumpMySQLDb(db string, dst string, params config.Params, logger Logger) (st
 	var cmd *exec.Cmd
 	var cmd2 *exec.Cmd
 	var stderr bytes.Buffer
+	output := make([]byte, 100)
 
 	if encrypted {
 		format = "7zip"
@@ -91,7 +92,6 @@ func dumpMySQLDb(db string, dst string, params config.Params, logger Logger) (st
 		logger.Error("Couldn't back up " + db + " - Error: " + err.Error())
 		return "", "", err
 	}
-	output := make([]byte, 100)
 
 	if !encrypted && format == "gzip" {
 		name = name + ".sql.gz"
@@ -126,11 +126,6 @@ func dumpMySQLDb(db string, dst string, params config.Params, logger Logger) (st
 			logger.Error("Couldn't compress " + db + " - Error: " + err.Error())
 			return "", "", err
 		}
-		n, _ := stderr2.Read(output)
-		if n > 0 {
-			logger.Error("Couldn't back up " + db + " - Error: " + string(string(output[:n])))
-			return dumpPath, name, errors.New(string(output[:n]))
-		}
 	} else {
 		name = name + ".sql.7z"
 		dumpPath = dst + "/" + name
@@ -148,12 +143,11 @@ func dumpMySQLDb(db string, dst string, params config.Params, logger Logger) (st
 			logger.Error("Couldn't compress " + db + " - Error: " + err.Error() + " - " + stderr.String())
 			return "", "", err
 		}
-		n, _ := stderr2.Read(output)
-		if n > 0 {
-			logger.Error("Couldn't back up " + db + " - Error: " + string(string(output[:n])))
-			return dumpPath, name, errors.New(string(output[:n]))
-		}
 	}
-
+	n, _ := stderr2.Read(output)
+	if n > 0 {
+		logger.Error("Couldn't back up " + db + " - Error: " + string(string(output[:n])))
+		return dumpPath, name, errors.New(string(output[:n]))
+	}
 	return dumpPath, name, nil
 }