use defer based approach

Author: besendorf

acquisition/acquisition.go

@@ -34,6 +34,7 @@ type Acquisition struct {
 	TmpDir           string         `json:"tmp_dir"`
 	SdCard           string         `json:"sdcard"`
 	Cpu              string         `json:"cpu"`
+	closeLog         func()         `json:"-"`
 }
 
 // New returns a new Acquisition instance.
@@ -77,16 +78,24 @@ func New(path string) (*Acquisition, error) {
 
 	// Init logging file
 	logPath := filepath.Join(acq.StoragePath, "command.log")
-	log.EnableFileLog(log.DEBUG, logPath)
+	closeLog, err := log.EnableFileLog(log.DEBUG, logPath)
+	if err != nil {
+		return nil, fmt.Errorf("failed to enable file logging: %v", err)
+	}
+
+	// Store cleanup function for later use
+	acq.closeLog = closeLog
 
 	return &acq, nil
 }
 
 func (a *Acquisition) Complete() {
 	a.Completed = time.Now().UTC()
 
-	// Close the log file before cleanup
-	log.CloseFileLog()
+	// Ensure log file is closed before cleanup operations
+	if a.closeLog != nil {
+		defer a.closeLog()
+	}
 
 	if a.Collector != nil {
 		a.Collector.Clean()

acquisition/secure.go

@@ -88,8 +88,10 @@ func (a *Acquisition) StoreSecurely() error {
 		return fmt.Errorf("failed to delete the unencrypted compressed archive: %v", err)
 	}
 
-	// Close the log file before removing the acquisition directory
-	log.CloseFileLog()
+	// Ensure log file is closed before removing the acquisition directory
+	if a.closeLog != nil {
+		defer a.closeLog()
+	}
 
 	err = os.RemoveAll(a.StoragePath)
 	if err != nil {

log/logger.go

@@ -129,24 +129,26 @@ func Coloring(enable bool) {
 	log.Color = enable
 }
 
-func EnableFileLog(level LEVEL, filePath string) error {
+func EnableFileLog(level LEVEL, filePath string) (func(), error) {
 	if filePath == "" {
-		return errors.New("invalid file path")
+		return nil, errors.New("invalid file path")
 	}
 
 	file, err := os.OpenFile(filePath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0o666)
 	if err != nil {
-		return err
+		return nil, err
 	}
 	log.fd = file
 	log.fileName = filePath
-	return nil
+
+	// Return cleanup function for defer pattern
+	cleanup := func() {
+		CloseFileLog()
+	}
+	return cleanup, nil
 }
 
 func CloseFileLog() {
-	log.fd.Close()
-	log.fd = nil
-	log.fileName = ""
 	if log.fd != nil {
 		log.fd.Close()
 		log.fd = nil