Update release binaries

internet2 · Jan 6, 2020 · 10a1441 · 10a1441
1 parent cf4f44d
commit 10a1441
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/dist/restore/index.js b/dist/restore/index.js
@@ -1626,14 +1626,19 @@ function uploadChunk(restClient, resourceUrl, data, start, end) {
     });
 }
 function uploadFile(restClient, cacheId, archivePath) {
-    var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         // Upload Chunks
         const fileSize = fs.statSync(archivePath).size;
         const resourceUrl = getCacheApiUrl() + "caches/" + cacheId.toString();
         const fd = fs.openSync(archivePath, "r");
-        const concurrency = (_a = Number(process.env["CACHE_UPLOAD_CONCURRENCY"]), (_a !== null && _a !== void 0 ? _a : 4)); // # of HTTP requests in parallel
-        const MAX_CHUNK_SIZE = (_b = Number(process.env["CACHE_UPLOAD_CHUNK_SIZE"]), (_b !== null && _b !== void 0 ? _b : 32 * 1024 * 1024)); // 32 MB Chunks
+        let concurrency = Number(process.env["CACHE_UPLOAD_CONCURRENCY"]); // # of HTTP requests in parallel
+        if (Number.isNaN(concurrency) || concurrency < 0) {
+            concurrency = 4;
+        }
+        let MAX_CHUNK_SIZE = Number(process.env["CACHE_UPLOAD_CHUNK_SIZE"]);
+        if (Number.isNaN(MAX_CHUNK_SIZE) || MAX_CHUNK_SIZE < 0) {
+            concurrency = 32 * 1024 * 1024; // 32 MB Chunks
+        }
         core.debug(`Concurrency: ${concurrency} and Chunk Size: ${MAX_CHUNK_SIZE}`);
         const parallelUploads = [...new Array(concurrency).keys()];
         core.debug("Awaiting all uploads");

diff --git a/dist/save/index.js b/dist/save/index.js
@@ -1626,14 +1626,19 @@ function uploadChunk(restClient, resourceUrl, data, start, end) {
     });
 }
 function uploadFile(restClient, cacheId, archivePath) {
-    var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         // Upload Chunks
         const fileSize = fs.statSync(archivePath).size;
         const resourceUrl = getCacheApiUrl() + "caches/" + cacheId.toString();
         const fd = fs.openSync(archivePath, "r");
-        const concurrency = (_a = Number(process.env["CACHE_UPLOAD_CONCURRENCY"]), (_a !== null && _a !== void 0 ? _a : 4)); // # of HTTP requests in parallel
-        const MAX_CHUNK_SIZE = (_b = Number(process.env["CACHE_UPLOAD_CHUNK_SIZE"]), (_b !== null && _b !== void 0 ? _b : 32 * 1024 * 1024)); // 32 MB Chunks
+        let concurrency = Number(process.env["CACHE_UPLOAD_CONCURRENCY"]); // # of HTTP requests in parallel
+        if (Number.isNaN(concurrency) || concurrency < 0) {
+            concurrency = 4;
+        }
+        let MAX_CHUNK_SIZE = Number(process.env["CACHE_UPLOAD_CHUNK_SIZE"]);
+        if (Number.isNaN(MAX_CHUNK_SIZE) || MAX_CHUNK_SIZE < 0) {
+            concurrency = 32 * 1024 * 1024; // 32 MB Chunks
+        }
         core.debug(`Concurrency: ${concurrency} and Chunk Size: ${MAX_CHUNK_SIZE}`);
         const parallelUploads = [...new Array(concurrency).keys()];
         core.debug("Awaiting all uploads");