hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Capture and log stderr while computing unix shell env on failure

Browse Source 
Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton 2022-10-28 08:25:32 -04:00
parent 487079b61f
commit 35b7c2c062
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/utils/shell-env/compute-shell-environment.injectable.ts
View File

@ -6,7 +6,7 @@
import type { AsyncResult } from "../../../common/utils/async-result"; import type { AsyncResult } from "../../../common/utils/async-result";
import { getInjectable } from "@ogre-tools/injectable"; import { getInjectable } from "@ogre-tools/injectable";
import isWindowsInjectable from "../../../common/vars/is-windows.injectable"; import isWindowsInjectable from "../../../common/vars/is-windows.injectable";
import { disposer } from "../../../common/utils"; import { disposer, hasTypedProperty, isString } from "../../../common/utils";
import computeUnixShellEnvironmentInjectable from "./compute-unix-shell-environment.injectable"; import computeUnixShellEnvironmentInjectable from "./compute-unix-shell-environment.injectable";
export type EnvironmentVariables = Partial<Record<string, string>>; export type EnvironmentVariables = Partial<Record<string, string>>;
@ -47,6 +47,13 @@ const computeShellEnvironmentInjectable = getInjectable({
}; };
} }
if (error && hasTypedProperty(error, "stderr", isString)) {
return {
callWasSuccessful: false,
error: `${error}:\n${error.stderr}`,
};
}
return { return {
callWasSuccessful: false, callWasSuccessful: false,
error: String(error), error: String(error),

6
src/main/utils/shell-env/compute-unix-shell-environment.injectable.ts
View File

@ -64,15 +64,19 @@ const computeUnixShellEnvironmentInjectable = getInjectable({
env, env,
}); });
const stdout: Buffer[] = []; const stdout: Buffer[] = [];
const stderr: Buffer[] = [];
opts.signal?.addEventListener("abort", () => shellProcess.kill()); opts.signal?.addEventListener("abort", () => shellProcess.kill());
shellProcess.stdout.on("data", b => stdout.push(b)); shellProcess.stdout.on("data", b => stdout.push(b));
shellProcess.stderr.on("data", b => stderr.push(b));
shellProcess.on("error", (err) => reject(err)); shellProcess.on("error", (err) => reject(err));
shellProcess.on("close", (code, signal) => { shellProcess.on("close", (code, signal) => {
if (code || signal) { if (code || signal) {
return reject(new Error(`Unexpected return code from spawned shell (code: ${code}, signal: ${signal})`)); return reject(Object.assign(new Error(`Unexpected return code from spawned shellPath=${shellPath} (code: ${code}, signal: ${signal})`), {
stderr: Buffer.concat(stderr).toString("utf-8"),
}));
} }
try { try {