From 3e16334e126f0c8f6bcd8e2c697bab367b3caa44 Mon Sep 17 00:00:00 2001
From: Jono Wenger <jono@elixxir.io>
Date: Thu, 30 Dec 2021 09:49:34 -0800
Subject: [PATCH] Fix debug logs
---
storage/fileTransfer/receiveTransfer.go | 2 +-
storage/fileTransfer/sentFileTransfers.go | 2 +-
storage/fileTransfer/sentPartTracker.go | 8 +++++++-
storage/fileTransfer/sentTransfer.go | 2 +-
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/storage/fileTransfer/receiveTransfer.go b/storage/fileTransfer/receiveTransfer.go
index 1f5d0756c..df4bad661 100644
--- a/storage/fileTransfer/receiveTransfer.go
+++ b/storage/fileTransfer/receiveTransfer.go
@@ -244,7 +244,7 @@ func (rt *ReceivedTransfer) stopScheduledProgressCB() error {
err := cb.stopThread()
if err != nil {
failedCallbacks = append(failedCallbacks, i)
- jww.WARN.Print(err.Error())
+ jww.WARN.Printf("[FT] %s", err)
}
}
diff --git a/storage/fileTransfer/sentFileTransfers.go b/storage/fileTransfer/sentFileTransfers.go
index b68c265b1..485eb67d0 100644
--- a/storage/fileTransfer/sentFileTransfers.go
+++ b/storage/fileTransfer/sentFileTransfers.go
@@ -36,7 +36,7 @@ const (
newSentTransferErr = "failed to create new sent transfer: %+v"
getSentTransferErr = "sent file transfer not found"
- cancelCallbackErr = "Transfer with ID %s: %+v"
+ cancelCallbackErr = "[FT] Transfer with ID %s: %+v"
deleteSentTransferErr = "failed to delete sent transfer with ID %s from store: %+v"
)
diff --git a/storage/fileTransfer/sentPartTracker.go b/storage/fileTransfer/sentPartTracker.go
index b65a6aa11..b5d30cf6e 100644
--- a/storage/fileTransfer/sentPartTracker.go
+++ b/storage/fileTransfer/sentPartTracker.go
@@ -13,6 +13,12 @@ import (
"gitlab.com/elixxir/client/storage/utility"
)
+// Error messages.
+const (
+ // sentPartTracker.GetPartStatus
+ getInvalidPartErr = "[FT] Failed to get status for part %d: %+v"
+)
+
// sentPartTracker tracks the status of individual sent file parts.
type sentPartTracker struct {
// The number of file parts in the file
@@ -39,7 +45,7 @@ func newSentPartTracker(partStats *utility.MultiStateVector) sentPartTracker {
func (spt sentPartTracker) GetPartStatus(partNum uint16) interfaces.FpStatus {
status, err := spt.partStats.Get(partNum)
if err != nil {
- jww.FATAL.Fatalf("failed to get status for part %d: %+v", partNum, err)
+ jww.FATAL.Fatalf(getInvalidPartErr, partNum, err)
}
return interfaces.FpStatus(status)
}
diff --git a/storage/fileTransfer/sentTransfer.go b/storage/fileTransfer/sentTransfer.go
index 351c50a78..a91a59847 100644
--- a/storage/fileTransfer/sentTransfer.go
+++ b/storage/fileTransfer/sentTransfer.go
@@ -388,7 +388,7 @@ func (st *SentTransfer) stopScheduledProgressCB() error {
err := cb.stopThread()
if err != nil {
failedCallbacks = append(failedCallbacks, i)
- jww.WARN.Print(err.Error())
+ jww.WARN.Printf("[FT] %s", err)
}
}
--
GitLab