something

internal/storage/storage.go

@@ -378,43 +378,47 @@ func (s *Storage) CreateJobContext(jobID int64) (string, error) {
 			return "", fmt.Errorf("failed to open file %s: %w", filePath, err)
 		}
 
-		info, err := file.Stat()
+		// Use a function closure to ensure file is closed even on error
+		err = func() error {
+			defer file.Close()
+
+			info, err := file.Stat()
+			if err != nil {
+				return fmt.Errorf("failed to stat file %s: %w", filePath, err)
+			}
+
+			// Get relative path for tar header
+			relPath, err := filepath.Rel(jobPath, filePath)
+			if err != nil {
+				return fmt.Errorf("failed to get relative path for %s: %w", filePath, err)
+			}
+
+			// Normalize path separators for tar (use forward slashes)
+			tarPath := filepath.ToSlash(relPath)
+
+			// Create tar header
+			header, err := tar.FileInfoHeader(info, "")
+			if err != nil {
+				return fmt.Errorf("failed to create tar header for %s: %w", filePath, err)
+			}
+			header.Name = tarPath
+
+			// Write header
+			if err := tarWriter.WriteHeader(header); err != nil {
+				return fmt.Errorf("failed to write tar header for %s: %w", filePath, err)
+			}
+
+			// Copy file contents using streaming
+			if _, err := io.Copy(tarWriter, file); err != nil {
+				return fmt.Errorf("failed to write file %s to tar: %w", filePath, err)
+			}
+
+			return nil
+		}()
+
 		if err != nil {
-			file.Close()
-			return "", fmt.Errorf("failed to stat file %s: %w", filePath, err)
+			return "", err
 		}
-
-		// Get relative path for tar header
-		relPath, err := filepath.Rel(jobPath, filePath)
-		if err != nil {
-			file.Close()
-			return "", fmt.Errorf("failed to get relative path for %s: %w", filePath, err)
-		}
-
-		// Normalize path separators for tar (use forward slashes)
-		tarPath := filepath.ToSlash(relPath)
-
-		// Create tar header
-		header, err := tar.FileInfoHeader(info, "")
-		if err != nil {
-			file.Close()
-			return "", fmt.Errorf("failed to create tar header for %s: %w", filePath, err)
-		}
-		header.Name = tarPath
-
-		// Write header
-		if err := tarWriter.WriteHeader(header); err != nil {
-			file.Close()
-			return "", fmt.Errorf("failed to write tar header for %s: %w", filePath, err)
-		}
-
-		// Copy file contents using streaming
-		if _, err := io.Copy(tarWriter, file); err != nil {
-			file.Close()
-			return "", fmt.Errorf("failed to write file %s to tar: %w", filePath, err)
-		}
-
-		file.Close()
 	}
 
 	// Ensure all data is flushed
@@ -550,42 +554,47 @@ func (s *Storage) CreateJobContextFromDir(sourceDir string, jobID int64, exclude
 			return "", fmt.Errorf("failed to open file %s: %w", filePath, err)
 		}
 
-		info, err := file.Stat()
+		// Use a function closure to ensure file is closed even on error
+		err = func() error {
+			defer file.Close()
+
+			info, err := file.Stat()
+			if err != nil {
+				return fmt.Errorf("failed to stat file %s: %w", filePath, err)
+			}
+
+			// Get relative path and strip common prefix if present
+			relPath := relPaths[i]
+			tarPath := filepath.ToSlash(relPath)
+			
+			// Strip common prefix if found
+			if commonPrefix != "" && strings.HasPrefix(tarPath, commonPrefix) {
+				tarPath = strings.TrimPrefix(tarPath, commonPrefix)
+			}
+
+			// Create tar header
+			header, err := tar.FileInfoHeader(info, "")
+			if err != nil {
+				return fmt.Errorf("failed to create tar header for %s: %w", filePath, err)
+			}
+			header.Name = tarPath
+
+			// Write header
+			if err := tarWriter.WriteHeader(header); err != nil {
+				return fmt.Errorf("failed to write tar header for %s: %w", filePath, err)
+			}
+
+			// Copy file contents using streaming
+			if _, err := io.Copy(tarWriter, file); err != nil {
+				return fmt.Errorf("failed to write file %s to tar: %w", filePath, err)
+			}
+
+			return nil
+		}()
+
 		if err != nil {
-			file.Close()
-			return "", fmt.Errorf("failed to stat file %s: %w", filePath, err)
+			return "", err
 		}
-
-		// Get relative path and strip common prefix if present
-		relPath := relPaths[i]
-		tarPath := filepath.ToSlash(relPath)
-		
-		// Strip common prefix if found
-		if commonPrefix != "" && strings.HasPrefix(tarPath, commonPrefix) {
-			tarPath = strings.TrimPrefix(tarPath, commonPrefix)
-		}
-
-		// Create tar header
-		header, err := tar.FileInfoHeader(info, "")
-		if err != nil {
-			file.Close()
-			return "", fmt.Errorf("failed to create tar header for %s: %w", filePath, err)
-		}
-		header.Name = tarPath
-
-		// Write header
-		if err := tarWriter.WriteHeader(header); err != nil {
-			file.Close()
-			return "", fmt.Errorf("failed to write tar header for %s: %w", filePath, err)
-		}
-
-		// Copy file contents using streaming
-		if _, err := io.Copy(tarWriter, file); err != nil {
-			file.Close()
-			return "", fmt.Errorf("failed to write file %s to tar: %w", filePath, err)
-		}
-
-		file.Close()
 	}
 
 	// Ensure all data is flushed