1
0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00

fix Cmd+Q exit error

Signed-off-by: Roman <ixrock@gmail.com>
This commit is contained in:
Roman 2020-08-03 16:45:59 +03:00
parent d4ff99f3bf
commit e9f60a7907

View File

@ -34,8 +34,6 @@ export class KubeAuthProxy {
const args = [ const args = [
"proxy", "proxy",
"-p", `${this.port}`, "-p", `${this.port}`,
// "--kubeconfig", `"${this.cluster.kubeConfigPath}"`,
// "--context", `"${this.cluster.contextName}"`,
"--kubeconfig", `${this.cluster.kubeConfigPath}`, "--kubeconfig", `${this.cluster.kubeConfigPath}`,
"--context", `${this.cluster.contextName}`, "--context", `${this.cluster.contextName}`,
"--accept-hosts", ".*", "--accept-hosts", ".*",
@ -49,12 +47,9 @@ export class KubeAuthProxy {
this.proxyProcess.on("exit", (code) => { this.proxyProcess.on("exit", (code) => {
this.sendIpcLogMessage({ data: `proxy exited with code: ${code}`, error: code > 0 }) this.sendIpcLogMessage({ data: `proxy exited with code: ${code}`, error: code > 0 })
this.proxyProcess.removeAllListeners(); this.exit();
this.proxyProcess.stderr.removeAllListeners();
this.proxyProcess.stdout.removeAllListeners();
this.proxyProcess = null;
}) })
this.proxyProcess.stdout.on('data', (data) => { this.proxyProcess.stdout.on('data', (data) => {
let logItem = data.toString() let logItem = data.toString()
if (logItem.startsWith("Starting to serve on")) { if (logItem.startsWith("Starting to serve on")) {
@ -62,7 +57,7 @@ export class KubeAuthProxy {
} }
this.sendIpcLogMessage({ data: logItem }) this.sendIpcLogMessage({ data: logItem })
}) })
this.proxyProcess.stderr.on('data', (data) => { this.proxyProcess.stderr.on('data', (data) => {
this.lastError = this.parseError(data.toString()) this.lastError = this.parseError(data.toString())
this.sendIpcLogMessage({ data: data.toString(), error: true }) this.sendIpcLogMessage({ data: data.toString(), error: true })
@ -97,10 +92,12 @@ export class KubeAuthProxy {
} }
public exit() { public exit() {
if (this.proxyProcess) { if (!this.proxyProcess) return;
logger.debug("[KUBE-AUTH]: stopping local proxy", this.cluster.getMeta()) logger.debug("[KUBE-AUTH]: stopping local proxy", this.cluster.getMeta())
this.proxyProcess.kill() this.proxyProcess.kill()
this.proxyProcess = null; this.proxyProcess.removeAllListeners();
} this.proxyProcess.stderr.removeAllListeners();
this.proxyProcess.stdout.removeAllListeners();
this.proxyProcess = null;
} }
} }