Skip to content

Commit 62cf1f7

Browse files
committed
feat(dragonfly-client): replace inspect_err with unwrap_or_else for error handling in piece download requests
Signed-off-by: Gaius <gaius.qi@gmail.com>
1 parent c11f533 commit 62cf1f7

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

dragonfly-client/src/resource/persistent_cache_task.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1145,13 +1145,13 @@ impl PersistentCacheTask {
11451145
REQUEST_TIMEOUT,
11461146
)
11471147
.await
1148-
.inspect_err(|err| {
1148+
.unwrap_or_else(|err| {
11491149
error!(
11501150
"send DownloadPieceFinishedRequest for piece {} failed: {:?}",
11511151
piece_id, err
11521152
);
11531153
interrupt.store(true, Ordering::SeqCst);
1154-
})?;
1154+
});
11551155

11561156
// Send the download progress.
11571157
download_progress_tx
@@ -1171,13 +1171,13 @@ impl PersistentCacheTask {
11711171
REQUEST_TIMEOUT,
11721172
)
11731173
.await
1174-
.inspect_err(|err| {
1174+
.unwrap_or_else(|err| {
11751175
error!(
11761176
"send DownloadPieceFinishedResponse for piece {} failed: {:?}",
11771177
piece_id, err
11781178
);
11791179
interrupt.store(true, Ordering::SeqCst);
1180-
})?;
1180+
});
11811181

11821182
info!(
11831183
"finished persistent cache piece {} from parent {:?}",
@@ -1372,12 +1372,12 @@ impl PersistentCacheTask {
13721372
REQUEST_TIMEOUT,
13731373
)
13741374
.await
1375-
.inspect_err(|err| {
1375+
.unwrap_or_else(|err| {
13761376
error!(
13771377
"send DownloadPieceFinishedResponse for piece {} failed: {:?}",
13781378
piece_id, err
13791379
);
1380-
})?;
1380+
});
13811381

13821382
// Store the finished piece.
13831383
finished_pieces.push(interested_piece.clone());

dragonfly-client/src/resource/task.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1113,13 +1113,13 @@ impl Task {
11131113
REQUEST_TIMEOUT,
11141114
)
11151115
.await
1116-
.inspect_err(|err| {
1116+
.unwrap_or_else(|err| {
11171117
error!(
11181118
"send DownloadPieceFinishedRequest for piece {} failed: {:?}",
11191119
piece_id, err
11201120
);
11211121
interrupt.store(true, Ordering::SeqCst);
1122-
})?;
1122+
});
11231123

11241124
// Send the download progress.
11251125
download_progress_tx
@@ -1139,13 +1139,13 @@ impl Task {
11391139
REQUEST_TIMEOUT,
11401140
)
11411141
.await
1142-
.inspect_err(|err| {
1142+
.unwrap_or_else(|err| {
11431143
error!(
11441144
"send DownloadPieceFinishedResponse for piece {} failed: {:?}",
11451145
piece_id, err
11461146
);
11471147
interrupt.store(true, Ordering::SeqCst);
1148-
})?;
1148+
});
11491149

11501150
info!(
11511151
"finished piece {} from parent {:?}",
@@ -1372,9 +1372,9 @@ impl Task {
13721372
},
13731373
REQUEST_TIMEOUT,
13741374
)
1375-
.await.inspect_err(|err| {
1375+
.await.unwrap_or_else(|err| {
13761376
error!("send DownloadPieceBackToSourceFinishedRequest for piece {} failed: {:?}", piece_id, err);
1377-
})?;
1377+
});
13781378

13791379
// Send the download progress.
13801380
download_progress_tx
@@ -1394,12 +1394,12 @@ impl Task {
13941394
REQUEST_TIMEOUT,
13951395
)
13961396
.await
1397-
.inspect_err(|err| {
1397+
.unwrap_or_else(|err| {
13981398
error!(
13991399
"send DownloadPieceFinishedResponse for piece {} failed: {:?}",
14001400
piece_id, err
14011401
);
1402-
})?;
1402+
});
14031403

14041404
info!("finished piece {} from source", piece_id);
14051405
Ok(metadata)
@@ -1625,12 +1625,12 @@ impl Task {
16251625
REQUEST_TIMEOUT,
16261626
)
16271627
.await
1628-
.inspect_err(|err| {
1628+
.unwrap_or_else(|err| {
16291629
error!(
16301630
"send DownloadPieceFinishedResponse for piece {} failed: {:?}",
16311631
piece_id, err
16321632
);
1633-
})?;
1633+
});
16341634

16351635
// Store the finished piece.
16361636
finished_pieces.push(interested_piece.clone());
@@ -1739,12 +1739,12 @@ impl Task {
17391739
REQUEST_TIMEOUT,
17401740
)
17411741
.await
1742-
.inspect_err(|err| {
1742+
.unwrap_or_else(|err| {
17431743
error!(
17441744
"send DownloadPieceFinishedResponse for piece {} failed: {:?}",
17451745
piece_id, err
17461746
);
1747-
})?;
1747+
});
17481748

17491749
info!("finished piece {} from source", piece_id);
17501750
Ok(metadata)

0 commit comments

Comments
 (0)