Skip to content
Snippets Groups Projects

XX-4277 / Fix file transfer crashes

Merged Jono Wenger requested to merge XX-4277/fileTransferCrashDebug into release
1 file
+ 2
2
Compare changes
  • Side-by-side
  • Inline
+ 11
0
@@ -209,6 +209,12 @@ func NewManager(params Params, user FtE2e) (FileTransfer, error) {
m.addFingerprints(rt)
}
jww.INFO.Printf(
"[FT] Created new file transfer manager with parameters: %+v"+
"\nAdding %d unsent parts to be sent."+
"\nQueueing %d incomplete received transfers.",
params, len(unsentParts), len(incompleteTransfers))
return m, nil
}
@@ -319,6 +325,7 @@ func (m *manager) Send(recipient *id.ID, fileName, fileType string,
if err != nil {
return nil, errors.Errorf(errMarshalInfo, err)
}
err = sendNew(transferInfo)
if err != nil {
return nil, errors.Errorf(errSendNewMsg, err)
@@ -334,6 +341,10 @@ func (m *manager) Send(recipient *id.ID, fileName, fileType string,
return nil, errors.Errorf(errAddSentTransfer, err)
}
jww.DEBUG.Printf("[FT] Created new sent file transfer %s for %q "+
"(type %s, size %d bytes, %d parts, retry %f)",
st.TransferID(), fileName, fileType, fileSize, numParts, retry)
// Add all parts to the send queue
for _, p := range st.GetUnsentParts() {
m.batchQueue <- p
Loading