From 6e4935b32843d1007b1070275d4e99edb345d6bc Mon Sep 17 00:00:00 2001
From: Jeff Halter <868228+jhalter@users.noreply.github.com>
Date: Thu, 25 Jul 2024 17:00:43 -0700
Subject: Wrap file transfer errors with more context

---
 hotline/file_transfer.go | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'hotline/file_transfer.go')

diff --git a/hotline/file_transfer.go b/hotline/file_transfer.go
index 847c7fe..b11aeae 100644
--- a/hotline/file_transfer.go
+++ b/hotline/file_transfer.go
@@ -326,12 +326,14 @@ func UploadHandler(rwc io.ReadWriter, fullPath string, fileTransfer *FileTransfe
 		}
 	}
 
+	defer file.Close()
+
 	f, err := NewFileWrapper(fileStore, fullPath, 0)
 	if err != nil {
 		return err
 	}
 
-	rLogger.Info("File upload started", "dstFile", fullPath)
+	rLogger.Debug("File upload started", "dstFile", fullPath)
 
 	rForkWriter := io.Discard
 	iForkWriter := io.Discard
@@ -348,15 +350,11 @@ func UploadHandler(rwc io.ReadWriter, fullPath string, fileTransfer *FileTransfe
 	}
 
 	if err := receiveFile(rwc, file, rForkWriter, iForkWriter, fileTransfer.bytesSentCounter); err != nil {
-		rLogger.Error(err.Error())
-	}
-
-	if err := file.Close(); err != nil {
-		return err
+		return fmt.Errorf("receive file: %v", err)
 	}
 
 	if err := fileStore.Rename(fullPath+".incomplete", fullPath); err != nil {
-		return err
+		return fmt.Errorf("rename incomplete file: %v", err)
 	}
 
 	rLogger.Info("File upload complete", "dstFile", fullPath)
-- 
cgit