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

fix handling of no timeout

Browse Source 
Signed-off-by: Jim Ehrismann <jehrismann@mirantis.com>
This commit is contained in:
Jim Ehrismann 2021-06-08 09:39:25 -04:00
parent 90abfc479a
commit 9e3a05e087
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/utils/shell-env.ts
View File

@ -31,14 +31,20 @@ let shellSyncFailed = false;
export async function shellEnv(shell?: string, timeout?: number) : Promise<EnvironmentVariables> { export async function shellEnv(shell?: string, timeout?: number) : Promise<EnvironmentVariables> {
let envVars = {}; let envVars = {};
timeout ??= 0;
if (!shellSyncFailed) { if (!shellSyncFailed) {
try { try {
envVars = await Promise.race([ if (timeout > 0 ) {
shellEnvironment(shell), envVars = await Promise.race([
new Promise((_resolve, reject) => setTimeout(() => { shellEnvironment(shell),
reject(new Error("Resolving shell environment is taking very long. Please review your shell configuration.")); new Promise((_resolve, reject) => setTimeout(() => {
}, timeout)) reject(new Error("Resolving shell environment is taking very long. Please review your shell configuration."));
]); }, timeout))
]);
} else {
envVars = await shellEnvironment(shell);
}
} catch (error) { } catch (error) {
logger.error(`shellEnv: ${error}`); logger.error(`shellEnv: ${error}`);
shellSyncFailed = true; shellSyncFailed = true;