Only check pending directory on macOS

getsentry · Nov 18, 2022 · 59d5ebb · 59d5ebb
1 parent c1e28e9
commit 59d5ebb
Showing 1 changed file with 18 additions and 24 deletions.
diff --git a/src/main/integrations/sentry-minidump/minidump-loader.ts b/src/main/integrations/sentry-minidump/minidump-loader.ts
@@ -86,12 +86,17 @@ async function deleteCrashpadMetadataFile(crashesDirectory: string, waitMs: numb
   }
 }
 
-async function readDirAsyncIfExists(path: string): Promise<string[]> {
-  try {
-    return await readDirAsync(path);
-  } catch (_) {
-    return [];
+async function readDirsAsync(paths: string[]): Promise<string[]> {
+  const found: string[] = [];
+  for (const path of paths) {
+    try {
+      const files = await readDirAsync(path);
+      found.push(...files.map((file) => join(path, file)));
+    } catch (_) {
+      //
+    }
   }
+  return found;
 }
 
 function crashpadMinidumpLoader(): MinidumpLoader {
@@ -101,31 +106,20 @@ function crashpadMinidumpLoader(): MinidumpLoader {
   return createMinidumpLoader(async () => {
     await deleteCrashpadMetadataFile(crashesDirectory).catch((error) => logger.error(error));
 
-    const dumpDirectory = join(crashesDirectory, crashpadSubDirectory);
-    const pendingDirectory = join(crashesDirectory, 'pending');
+    const dumpDirectories = [join(crashesDirectory, crashpadSubDirectory)];
 
-    return (await readDirAsyncIfExists(dumpDirectory))
-      .filter((file) => file.endsWith('.dmp'))
-      .map((file) => {
-        const path = join(dumpDirectory, file);
+    if (process.platform === 'darwin') {
+      dumpDirectories.push(join(crashesDirectory, 'pending'));
+    }
 
+    return (await readDirsAsync(dumpDirectories))
+      .filter((file) => file.endsWith('.dmp'))
+      .map((path) => {
         return {
           path,
           load: () => readFileAsync(path),
         };
-      })
-      .concat(
-        (await readDirAsyncIfExists(pendingDirectory))
-          .filter((file) => file.endsWith('.dmp'))
-          .map((file) => {
-            const path = join(pendingDirectory, file);
-
-            return {
-              path,
-              load: () => readFileAsync(path),
-            };
-          }),
-      );
+      });
   });
 }