Wrap file transfer errors with more context

diff --git a/hotline/file_transfer.go b/hotline/file_transfer.go
index 847c7feedb4defa7c4eae7234f7d1c05741349e4..b11aeae585c89c7905921a474cd6ed2e3f789ce8 100644 (file)
--- 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
        }
 
        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
 
        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 {
        }
 
        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 {
        }
 
        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)
        }
 
        rLogger.Info("File upload complete", "dstFile", fullPath)

diff --git a/hotline/server.go b/hotline/server.go
index 758f7ff8a3fa9aeacfb2c9b9a4bb65b46f715141..b7f39b62d00e282a93d872efdfe725bddb1d8d79 100644 (file)
--- 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 {
                        )
 
                        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 5cb28c8e60fba1927470860ba22597485c28fe83..53dd356a24440133c909f433b1d907f66a3faaec 100644 (file)
--- a/hotline/transfer.go
+++ b/hotline/transfer.go
@@ -4,6 +4,7 @@ import (
        "bytes"
        "encoding/binary"
        "errors"
        "bytes"
        "encoding/binary"
        "errors"

+       "fmt"

        "io"
 )
 
        "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 {
 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 {
        }
 
        // 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 {
        }
 
        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 {
        }
 
        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 {
                }
 
                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
                }
        }
        return nil