libstore: remove Filetransfer::transfer
just use enqueueFileTransfer().get() insteaad. Change-Id: I67a43c9d3d5f68ac3f9e8ba7973c243dd78b86a3
This commit is contained in:
@@ -868,11 +868,6 @@ ref<FileTransfer> makeFileTransfer()
|
||||
return makeCurlFileTransfer();
|
||||
}
|
||||
|
||||
FileTransferResult FileTransfer::transfer(const FileTransferRequest & request)
|
||||
{
|
||||
return enqueueFileTransfer(request).get();
|
||||
}
|
||||
|
||||
template<typename... Args>
|
||||
FileTransferError::FileTransferError(FileTransfer::Error error, std::optional<std::string> response, const Args & ... args)
|
||||
: Error(args...), error(error), response(response)
|
||||
|
||||
@@ -94,11 +94,6 @@ struct FileTransfer
|
||||
*/
|
||||
virtual std::future<FileTransferResult> enqueueFileTransfer(const FileTransferRequest & request) = 0;
|
||||
|
||||
/**
|
||||
* Synchronously transfer a file.
|
||||
*/
|
||||
FileTransferResult transfer(const FileTransferRequest & request);
|
||||
|
||||
/**
|
||||
* Download a file, returning its contents through a source. Will not return
|
||||
* before the transfer has fully started, ensuring that any errors thrown by
|
||||
|
||||
@@ -116,7 +116,7 @@ protected:
|
||||
try {
|
||||
FileTransferRequest request{makeURI(path)};
|
||||
request.head = true;
|
||||
getFileTransfer()->transfer(request);
|
||||
getFileTransfer()->enqueueFileTransfer(request).get();
|
||||
return true;
|
||||
} catch (FileTransferError & e) {
|
||||
/* S3 buckets return 403 if a file doesn't exist and the
|
||||
@@ -136,7 +136,7 @@ protected:
|
||||
req.data = StreamToSourceAdapter(istream).drain();
|
||||
req.headers = {{"Content-Type", mimeType}};
|
||||
try {
|
||||
getFileTransfer()->transfer(req);
|
||||
getFileTransfer()->enqueueFileTransfer(req).get();
|
||||
} catch (FileTransferError & e) {
|
||||
throw UploadToHTTP("while uploading to HTTP binary cache at '%s': %s", cacheUri, e.msg());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user