cubetiq/code-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Wait for inner process to exit

Browse Source
This commit is contained in:
Asher 2021-01-20 15:29:45 -06:00
parent 055e0ef9ec
commit 3c6fac9ce4
No known key found for this signature in database
GPG Key ID: D63C1EF81242354A
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/node/wrapper.ts
View File

@ -234,9 +234,7 @@ export class ParentProcess extends Process {
this.logStdoutStream = rfs.createStream(path.join(paths.data, "coder-logs", "code-server-stdout.log"), opts) this.logStdoutStream = rfs.createStream(path.join(paths.data, "coder-logs", "code-server-stdout.log"), opts)
this.logStderrStream = rfs.createStream(path.join(paths.data, "coder-logs", "code-server-stderr.log"), opts) this.logStderrStream = rfs.createStream(path.join(paths.data, "coder-logs", "code-server-stderr.log"), opts)
this.onDispose(() => { this.onDispose(() => this.disposeChild())
this.disposeChild()
})
this.onChildMessage((message) => { this.onChildMessage((message) => {
switch (message.type) { switch (message.type) {
@ -252,11 +250,15 @@ export class ParentProcess extends Process {
}) })
} }
private disposeChild(): void { private async disposeChild(): Promise<void> {
this.started = undefined this.started = undefined
if (this.child) { if (this.child) {
this.child.removeAllListeners() const child = this.child
this.child.kill() child.removeAllListeners()
child.kill()
// Wait for the child to exit otherwise its output will be lost which can
// be especially problematic if you're trying to debug why cleanup failed.
await new Promise((r) => child!.on("exit", r))
} }
} }