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

Kill shell process by pid

Browse Source 
Signed-off-by: Lauri Nevala <lauri.nevala@gmail.com>
This commit is contained in:
Lauri Nevala 2020-06-08 12:05:45 +03:00
parent 50dfd4fa63
commit 5c9fd389a9
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/shell-session.ts
View File

@ -8,6 +8,7 @@ import { Kubectl } from "./kubectl"
import { tracker } from "./tracker" import { tracker } from "./tracker"
import { Cluster, ClusterPreferences } from "./cluster" import { Cluster, ClusterPreferences } from "./cluster"
import { helmCli } from "./helm-cli" import { helmCli } from "./helm-cli"
import logger from "./logger"
export class ShellSession extends EventEmitter { export class ShellSession extends EventEmitter {
static shellEnv: any static shellEnv: any
@ -159,12 +160,14 @@ export class ShellSession extends EventEmitter {
} }
protected exit(code = 1000) { protected exit(code = 1000) {
this.websocket.close(code) logger.debug("Shell closed")
if (this.websocket.readyState == this.websocket.OPEN) this.websocket.close(code)
this.emit('exit') this.emit('exit')
} }
protected closeWebsocketOnProcessExit() { protected closeWebsocketOnProcessExit() {
this.shellProcess.on("exit", (code) => { this.shellProcess.on("exit", (code) => {
logger.debug("Shell process exited", code)
this.running = false this.running = false
let timeout = 0 let timeout = 0
if (code > 0) { if (code > 0) {
@ -180,7 +183,13 @@ export class ShellSession extends EventEmitter {
protected exitProcessOnWebsocketClose() { protected exitProcessOnWebsocketClose() {
this.websocket.on("close", () => { this.websocket.on("close", () => {
if (this.shellProcess) { if (this.shellProcess) {
this.shellProcess.kill(); logger.debug("Killing shell process")
try {
process.kill(this.shellProcess.pid)
} catch(e) {
logger.debug("Process id not exist")
}
this.emit('exit')
} }
}) })
} }