1
0
Fork 0
mirror of https://code.forgejo.org/actions/cache.git synced 2024-12-23 12:36:01 +01:00

Merge pull request #300 from actions/aiyan/listen-on-error

error handling for stream
This commit is contained in:
Aiqiao Yan 2020-05-11 16:00:51 -04:00 committed by GitHub
commit 916cc60b3c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 8 deletions

View file

@ -2379,11 +2379,15 @@ function uploadFile(httpClient, cacheId, archivePath) {
const start = offset; const start = offset;
const end = offset + chunkSize - 1; const end = offset + chunkSize - 1;
offset += MAX_CHUNK_SIZE; offset += MAX_CHUNK_SIZE;
yield uploadChunk(httpClient, resourceUrl, () => fs.createReadStream(archivePath, { yield uploadChunk(httpClient, resourceUrl, () => fs
.createReadStream(archivePath, {
fd, fd,
start, start,
end, end,
autoClose: false autoClose: false
})
.on("error", error => {
throw new Error(`Cache upload failed because file read failed with ${error.Message}`);
}), start, end); }), start, end);
} }
}))); })));

6
dist/save/index.js vendored
View file

@ -2379,11 +2379,15 @@ function uploadFile(httpClient, cacheId, archivePath) {
const start = offset; const start = offset;
const end = offset + chunkSize - 1; const end = offset + chunkSize - 1;
offset += MAX_CHUNK_SIZE; offset += MAX_CHUNK_SIZE;
yield uploadChunk(httpClient, resourceUrl, () => fs.createReadStream(archivePath, { yield uploadChunk(httpClient, resourceUrl, () => fs
.createReadStream(archivePath, {
fd, fd,
start, start,
end, end,
autoClose: false autoClose: false
})
.on("error", error => {
throw new Error(`Cache upload failed because file read failed with ${error.Message}`);
}), start, end); }), start, end);
} }
}))); })));

View file

@ -295,12 +295,18 @@ async function uploadFile(
httpClient, httpClient,
resourceUrl, resourceUrl,
() => () =>
fs.createReadStream(archivePath, { fs
fd, .createReadStream(archivePath, {
start, fd,
end, start,
autoClose: false end,
}), autoClose: false
})
.on("error", error => {
throw new Error(
`Cache upload failed because file read failed with ${error.Message}`
);
}),
start, start,
end end
); );