Improve error handling

ehmicky · Sep 12, 2021 · 7ba6e65 · 7ba6e65
1 parent d57620d
commit 7ba6e65
Showing 1 changed file with 20 additions and 14 deletions.
diff --git a/src/run/process/runner.js b/src/run/process/runner.js
@@ -34,6 +34,7 @@ export const spawnRunnerProcess = async function ({
   combination: {
     dimensions: {
       runner: {
+        id,
         spawn: [file, ...args],
         spawnOptions,
       },
@@ -44,20 +45,25 @@ export const spawnRunnerProcess = async function ({
   serverUrl,
   logsStream,
 }) {
-  const childProcess = spawnProcess(
-    [file, ...args, serverUrl],
-    {
-      ...spawnOptions,
-      stdio: getStdio(logsStream),
-      reject: false,
-      detached: true,
-      cleanup: true,
-    },
-    cwd,
-  )
-  await waitForIpcSetup(childProcess, server)
-  const onTaskExit = noUnhandledRejection(throwOnTaskExit(childProcess))
-  return { childProcess, onTaskExit }
+  try {
+    const childProcess = spawnProcess(
+      [file, ...args, serverUrl],
+      {
+        ...spawnOptions,
+        stdio: getStdio(logsStream),
+        reject: false,
+        detached: true,
+        cleanup: true,
+      },
+      cwd,
+    )
+    await waitForIpcSetup(childProcess, server)
+    const onTaskExit = noUnhandledRejection(throwOnTaskExit(childProcess))
+    return { childProcess, onTaskExit }
+  } catch (error) {
+    error.message = `In runner "${id}":\n${error.message}`
+    throw error
+  }
 }
 
 // The `dev` command directly streams stdout/stderr.