Skip to content

Commit e69ae98

Browse files
Log completion message flow (#236)
1 parent 8931e01 commit e69ae98

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

impl/events.go

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,10 @@ func (m *manager) OnTransferQueued(chid datatransfer.ChannelID) {
165165
}
166166

167167
func (m *manager) OnResponseReceived(chid datatransfer.ChannelID, response datatransfer.Response) error {
168+
if response.IsComplete() {
169+
log.Infow("received complete response", "chid", chid, "isAccepted", response.Accepted())
170+
}
171+
168172
if response.IsCancel() {
169173
log.Infof("channel %s: received cancel response, cancelling channel", chid)
170174
return m.channels.Cancel(chid)
@@ -202,9 +206,11 @@ func (m *manager) OnResponseReceived(chid datatransfer.ChannelID, response datat
202206
}
203207
if response.IsComplete() && response.Accepted() {
204208
if !response.IsPaused() {
205-
log.Infof("channel %s: received complete response, completing channel", chid)
209+
log.Infow("received complete response,responder not paused, completing channel", "chid", chid)
206210
return m.channels.ResponderCompletes(chid)
207211
}
212+
213+
log.Infow("received complete response, responder is paused, not completing channel", "chid", chid)
208214
err := m.channels.ResponderBeginsFinalization(chid)
209215
if err != nil {
210216
return nil
@@ -244,17 +250,20 @@ func (m *manager) OnChannelCompleted(chid datatransfer.ChannelID, completeErr er
244250
if completeErr == nil {
245251
// If the channel was initiated by the other peer
246252
if chid.Initiator != m.peerID {
253+
log.Infow("received OnChannelCompleted, will send completion message to initiator", "chid", chid)
247254
msg, err := m.completeMessage(chid)
248255
if err != nil {
249-
return nil
256+
return err
250257
}
251258
if msg != nil {
252259
// Send the other peer a message that the transfer has completed
253-
log.Infof("channel %s: sending completion message to initiator", chid)
260+
log.Infow("sending completion message to initiator", "chid", chid)
254261
if err := m.dataTransferNetwork.SendMessage(context.Background(), chid.Initiator, msg); err != nil {
255262
err := xerrors.Errorf("channel %s: failed to send completion message to initiator: %w", chid, err)
256-
log.Warn(err)
263+
log.Warnw("failed to send completion message to initiator", "chid", chid, "err", err)
257264
return m.OnRequestDisconnected(chid, err)
265+
} else {
266+
log.Infow("successfully sent completion message to initiator", "chid", chid)
258267
}
259268
}
260269
if msg.Accepted() {

0 commit comments

Comments
 (0)