fix(puppet): retry on failure to delete chrome dir

blakebyrnes · blakebyrnes · commit ccb07b3a9f77 · 2021-07-12T09:15:59.000-04:00
diff --git a/puppet/lib/launchProcess.ts b/puppet/lib/launchProcess.ts
@@ -115,10 +115,20 @@ export default async function launchProcess(
       } else {
         launchedProcess.kill('SIGKILL');
       }
-      if (dataDir) Fs.rmdirSync(dataDir, { recursive: true });
+      if (dataDir) cleanDataDir(dataDir);
       return closed;
     } catch (error) {
       // might have already been kill off
     }
   }
+
+  function cleanDataDir(datadir: string, retries = 3): void {
+    try {
+      if (Fs.existsSync(datadir)) Fs.rmdirSync(dataDir, { recursive: true });
+    } catch (err) {
+      if (retries >= 0) {
+        cleanDataDir(datadir, retries - 1);
+      }
+    }
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -115,10 +115,20 @@ export default async function launchProcess(`
`115`	`115`	`} else {`
`116`	`116`	`launchedProcess.kill('SIGKILL');`
`117`	`117`	`}`
`118`		`- if (dataDir) Fs.rmdirSync(dataDir, { recursive: true });`
	`118`	`+ if (dataDir) cleanDataDir(dataDir);`
`119`	`119`	`return closed;`
`120`	`120`	`} catch (error) {`
`121`	`121`	`// might have already been kill off`
`122`	`122`	`}`
`123`	`123`	`}`
	`124`	`+`
	`125`	`+ function cleanDataDir(datadir: string, retries = 3): void {`
	`126`	`+ try {`
	`127`	`+ if (Fs.existsSync(datadir)) Fs.rmdirSync(dataDir, { recursive: true });`
	`128`	`+ } catch (err) {`
	`129`	`+ if (retries >= 0) {`
	`130`	`+ cleanDataDir(datadir, retries - 1);`
	`131`	`+ }`
	`132`	`+ }`
	`133`	`+ }`
`124`	`134`	`}`