From f05f89e280ed0847b2c37bb72b39008388b25393 Mon Sep 17 00:00:00 2001
From: Jono Wenger <jono@elixxir.io>
Date: Wed, 29 Dec 2021 12:17:07 -0800
Subject: [PATCH] Add debug messages on sending/receiving on new file transfer
---
fileTransfer/manager.go | 9 +++++++++
fileTransfer/receiveNew.go | 4 ++++
fileTransfer/send.go | 5 +++++
3 files changed, 18 insertions(+)
diff --git a/fileTransfer/manager.go b/fileTransfer/manager.go
index e1a82dab7..4ac4c1ab7 100644
--- a/fileTransfer/manager.go
+++ b/fileTransfer/manager.go
@@ -9,6 +9,7 @@ package fileTransfer
import (
"github.com/pkg/errors"
+ jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/api"
"gitlab.com/elixxir/client/interfaces"
"gitlab.com/elixxir/client/interfaces/message"
@@ -307,6 +308,10 @@ func (m Manager) Send(fileName, fileType string, fileData []byte,
}
rng.Close()
+ jww.DEBUG.Printf("[FT] Sending new file transfer %q to %s {parts: %d, "+
+ "size: %d, type: %q, ID: %s}",
+ fileName, recipient, numParts, fileSize, fileType, transferID)
+
// Add all parts to queue
m.queueParts(transferID, makeListOfPartNums(numParts))
@@ -372,6 +377,10 @@ func (m Manager) CloseSend(tid ftCrypto.TransferID) error {
return errors.Errorf(transferInProgressErr, tid)
}
+ jww.DEBUG.Printf("[FT] Closing file transfer %s sent to %s "+
+ "{completed: %t, parts: %d}",
+ tid, transfer.GetRecipient(), completed, transfer.GetNumParts())
+
// Delete the transfer from storage
return m.sent.DeleteTransfer(tid)
}
diff --git a/fileTransfer/receiveNew.go b/fileTransfer/receiveNew.go
index 2fa736cbb..47c873c80 100644
--- a/fileTransfer/receiveNew.go
+++ b/fileTransfer/receiveNew.go
@@ -82,6 +82,10 @@ func (m *Manager) readNewFileTransferMessage(msg message.Receive) (
return
}
+ jww.DEBUG.Printf("[FT] Received new file transfer %q from %s {parts: %d, "+
+ "size: %d, type: %q}",
+ newFT.FileName, msg.Sender, newFT.NumParts, newFT.Size, newFT.FileType)
+
// Get RNG from stream
rng := m.rng.GetStream()
defer rng.Close()
diff --git a/fileTransfer/send.go b/fileTransfer/send.go
index aad1d93cd..3dfe633ca 100644
--- a/fileTransfer/send.go
+++ b/fileTransfer/send.go
@@ -312,6 +312,11 @@ func (m *Manager) buildMessages(partList []queuedPart) (
// Generate new cMix message with encrypted file part
cmixMsg, err := m.newCmixMessage(transfer, part.partNum, rng)
if err == ftStorage.MaxRetriesErr {
+ jww.DEBUG.Printf("[FT] File transfer %s sent to %s ran out of "+
+ "retries {parts: %d, fingerprints: %d}",
+ part.tid, transfer.GetRecipient(), transfer.GetNumParts(),
+ transfer.GetNumFps())
+
// If the max number of retries has been reached, then report the
// error on the callback, delete the transfer, and skip to the next
// message
--
GitLab