wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 06:31:14 +02:00
Code Activity

add isInterrupted() call and replace some checkInterrupt() occurrences

Browse source
This commit is contained in:
Philipp Otterbein 2025-04-11 22:34:15 +02:00 • committed by Jörg Thalheim
parent db297d3dda
commit 49f757c24a
4 changed files with 24 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/libstore/s3-binary-cache-store.cc
View file

@ -187,11 +187,7 @@ S3Helper::FileTransferResult S3Helper::getObject(
});
request.SetContinueRequestHandler([](const Aws::Http::HttpRequest*) {
try {
checkInterrupt();
return true;
} catch(...) {}
return false;
return !isInterrupted();
});
FileTransferResult res;
@ -420,10 +416,9 @@ struct S3BinaryCacheStoreImpl : virtual S3BinaryCacheStoreConfig, public virtual
TransferStatus status = transferHandle->GetStatus();
while (status == TransferStatus::IN_PROGRESS || status == TransferStatus::NOT_STARTED) {
try {
checkInterrupt();
if (!isInterrupted()) {
context->wait();
} catch (...) {
} else {
transferHandle->Cancel();
transferHandle->WaitUntilFinished();
}
@ -454,11 +449,7 @@ struct S3BinaryCacheStoreImpl : virtual S3BinaryCacheStoreConfig, public virtual
});
request.SetContinueRequestHandler([](const Aws::Http::HttpRequest*) {
try {
checkInterrupt();
return true;
} catch(...) {}
return false;
return !isInterrupted();
});
request.SetContentType(mimeType);