From: Jeff Halter <redacted>
Date: Fri, 26 Jul 2024 00:00:43 +0000 (-0700)
Subject: Wrap file transfer errors with more context
X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/commitdiff_plain/6e4935b32843d1007b1070275d4e99edb345d6bc?ds=sidebyside

Wrap file transfer errors with more context
---

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)
diff --git a/hotline/server.go b/hotline/server.go
index 758f7ff..b7f39b6 100644
--- a/hotline/server.go
+++ b/hotline/server.go
@@ -174,7 +174,7 @@ func (s *Server) ServeFileTransfers(ctx context.Context, ln net.Listener) error
 			)
 
 			if err != nil {
-				s.Logger.Error("file transfer error", "reason", err)
+				s.Logger.Error("file transfer error", "err", err)
 			}
 		}()
 	}
diff --git a/hotline/transfer.go b/hotline/transfer.go
index 5cb28c8..53dd356 100644
--- a/hotline/transfer.go
+++ b/hotline/transfer.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"encoding/binary"
 	"errors"
+	"fmt"
 	"io"
 )
 
@@ -31,26 +32,26 @@ func (tf *transfer) Write(b []byte) (int, error) {
 func receiveFile(r io.Reader, targetFile, resForkFile, infoFork, counterWriter io.Writer) error {
 	var ffo flattenedFileObject
 	if _, err := ffo.ReadFrom(r); err != nil {
-		return err
+		return fmt.Errorf("read flatted file object: %v", err)
 	}
 
 	// Write the information fork
 	_, err := io.Copy(infoFork, &ffo.FlatFileInformationFork)
 	if err != nil {
-		return err
+		return fmt.Errorf("write the information fork: %v", err)
 	}
 
 	if _, err = io.CopyN(targetFile, io.TeeReader(r, counterWriter), ffo.dataSize()); err != nil {
-		return err
+		return fmt.Errorf("copy file data to partial file: %v", err)
 	}
 
 	if ffo.FlatFileHeader.ForkCount == [2]byte{0, 3} {
 		if err := binary.Read(r, binary.BigEndian, &ffo.FlatFileResForkHeader); err != nil {
-			return err
+			return fmt.Errorf("read resource fork header: %v", err)
 		}
 
 		if _, err = io.CopyN(resForkFile, io.TeeReader(r, counterWriter), ffo.rsrcSize()); err != nil {
-			return err
+			return fmt.Errorf("read resource fork: %v", err)
 		}
 	}
 	return nil