Merge pull request #2 from mcpt/JasonLovesDoggo/delete-fs-directory

Delete fs directory after compression

Author: JasonLovesDoggo

handlers/filesystem.go

@@ -158,7 +158,17 @@ func (h *FileSystemHandler) Backup(ctx context.Context) (string, error) {
 	}
 
 	// Create archive
-	return h.createArchive()
+	archivePath, err := h.createArchive()
+	if err != nil {
+		return "", err
+	}
+
+	// Delete the fs directory after creating the tarfile
+	if err := h.deleteDirectory(); err != nil {
+		return "", err
+	}
+
+	return archivePath, nil
 }
 
 // Name returns the handler name
@@ -175,3 +185,11 @@ func (h *FileSystemHandler) Cleanup() error {
 	}
 	return nil
 }
+
+// deleteDirectory deletes the fs directory
+func (h *FileSystemHandler) deleteDirectory() error {
+	if err := os.RemoveAll(config.Cfg.Filesystem.BasePath); err != nil {
+		return &ErrFileSystem{Op: "delete directory", Err: err}
+	}
+	return nil
+}

sentinel/main.go

@@ -155,6 +155,11 @@ func performBackup(handlerList []handlers.BackupHandler, uploader *storage.S3Upl
 		return err
 	}
 
+	// Delete the fs directory after creating the tarfile
+	if err := deleteDirectory(); err != nil {
+		return err
+	}
+
 	// Cleanup
 	for _, file := range backupFiles {
 		err := os.Remove(file)
@@ -169,3 +174,11 @@ func performBackup(handlerList []handlers.BackupHandler, uploader *storage.S3Upl
 
 	return nil
 }
+
+// deleteDirectory deletes the fs directory
+func deleteDirectory() error {
+	if err := os.RemoveAll(config.Cfg.Filesystem.BasePath); err != nil {
+		return fmt.Errorf("failed to delete directory: %v", err)
+	}
+	return nil
+}