OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

Remove unused wrapper options

Browse Source 
Also move our memory default to the beginning of NODE_OPTIONS so it can
be overidden. The version of the flag with dashes seems to be the more
correct one now so use that instead of underscores.

Related: #2113.
This commit is contained in:
Asher 2020-11-18 13:08:57 -06:00
parent 016daf2fdd
commit 95ef6dbf2f
No known key found for this signature in database
GPG Key ID: D63C1EF81242354A
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/node/wrapper.ts
View File

@ -201,11 +201,6 @@ class ChildProcess extends Process {
} }
} }
export interface WrapperOptions {
maxMemory?: number
nodeOptions?: string
}
/** /**
* Parent process wrapper that spawns the child process and performs a handshake * Parent process wrapper that spawns the child process and performs a handshake
* with it. Will relaunch the child if it receives a SIGUSR1 or is asked to by * with it. Will relaunch the child if it receives a SIGUSR1 or is asked to by
@ -224,7 +219,7 @@ export class ParentProcess extends Process {
private args?: DefaultedArgs private args?: DefaultedArgs
public constructor(private currentVersion: string, private readonly options?: WrapperOptions) { public constructor(private currentVersion: string) {
super() super()
process.on("SIGUSR1", async () => { process.on("SIGUSR1", async () => {
@ -310,18 +305,12 @@ export class ParentProcess extends Process {
} }
private spawn(): cp.ChildProcess { private spawn(): cp.ChildProcess {
// Flags to pass along to the Node binary.
let nodeOptions = `${process.env.NODE_OPTIONS || ""} ${(this.options && this.options.nodeOptions) || ""}`
if (!/max_old_space_size=(\d+)/g.exec(nodeOptions)) {
nodeOptions += ` --max_old_space_size=${(this.options && this.options.maxMemory) || 2048}`
}
// Use spawn (instead of fork) to use the new binary in case it was updated. // Use spawn (instead of fork) to use the new binary in case it was updated.
return cp.spawn(process.argv[0], process.argv.slice(1), { return cp.spawn(process.argv[0], process.argv.slice(1), {
env: { env: {
...process.env, ...process.env,
CODE_SERVER_PARENT_PID: process.pid.toString(), CODE_SERVER_PARENT_PID: process.pid.toString(),
NODE_OPTIONS: nodeOptions, NODE_OPTIONS: `--max-old-space-size=2048 ${process.env.NODE_OPTIONS || ""}`,
}, },
stdio: ["ipc"], stdio: ["ipc"],
}) })