add further logging

hashbite · May 28, 2021 · 77cb9d2 · 77cb9d2
1 parent 9c0d267
commit 77cb9d2
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/dist/restore/index.js b/dist/restore/index.js
@@ -692,17 +692,25 @@ function restoreCache(paths, primaryKey, restoreKeys, options) {
         const cacheDir = path_1.join(`/media/cache/`, process.env.GITHUB_REPOSITORY || "");
         // 1. check if we find any dir that matches our keys from restoreKeys
         const mkdirPromise = execAsync(`mkdir -p ${cacheDir}`);
+        // @todo order files by name/date
         yield streamOutputUntilResolved(mkdirPromise);
         const cacheFiles = yield readDirAsync(cacheDir);
-        console.log({ caches: cacheFiles });
         const potentialCaches = (restoreKeys || [primaryKey]).map(generateCacheName);
+        console.log({ cacheFiles, potentialCaches });
         const result = locateCache(potentialCaches, cacheFiles);
         if (typeof result !== "object") {
+            console.log("Unable to locate fitting cache file", {
+                cacheFiles,
+                potentialCaches,
+                restoreKeys,
+                primaryKey
+            });
             return undefined;
         }
         const { key, cache } = result;
         const cachePath = path_1.join(cacheDir, cache);
         const cmd = `lz4 -d -v -c ${cachePath} | tar xf - -C ${path_1.dirname(paths[0])}`;
+        // --skip-old-files
         console.log({ cacheDir, cache, cachePath, key, cmd });
         // 2. if we found one, rsync it back to the HD
         const createCacheDirPromise = execAsync(cmd);

diff --git a/dist/save/index.js b/dist/save/index.js
@@ -787,10 +787,16 @@ function restoreCache(paths, primaryKey, restoreKeys, options) {
         // @todo order files by name/date
         yield streamOutputUntilResolved(mkdirPromise);
         const cacheFiles = yield readDirAsync(cacheDir);
-        console.log({ caches: cacheFiles });
         const potentialCaches = (restoreKeys || [primaryKey]).map(generateCacheName);
+        console.log({ cacheFiles, potentialCaches });
         const result = locateCache(potentialCaches, cacheFiles);
         if (typeof result !== "object") {
+            console.log("Unable to locate fitting cache file", {
+                cacheFiles,
+                potentialCaches,
+                restoreKeys,
+                primaryKey
+            });
             return undefined;
         }
         const { key, cache } = result;

diff --git a/src/cache.ts b/src/cache.ts
@@ -118,15 +118,21 @@ export async function restoreCache(
 
     const cacheFiles = await readDirAsync(cacheDir);
 
-    console.log({ caches: cacheFiles });
-
     const potentialCaches = (restoreKeys || [primaryKey]).map(
         generateCacheName
     );
 
+    console.log({ cacheFiles, potentialCaches });
+
     const result = locateCache(potentialCaches, cacheFiles);
 
     if (typeof result !== "object") {
+        console.log("Unable to locate fitting cache file", {
+            cacheFiles,
+            potentialCaches,
+            restoreKeys,
+            primaryKey
+        });
         return undefined;
     }