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

Handle shared process error event; add some logging

Browse Source
This commit is contained in:
Asher 2019-02-19 17:53:14 -06:00
parent 6708c8a5c8
commit 6b5f50cddf
No known key found for this signature in database
GPG Key ID: 7BB4BA9C783D2BBC
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
packages/server/src/vscode/sharedProcess.ts
View File

@ -7,7 +7,7 @@ import { StdioIpcHandler } from "../ipc";
import { ParsedArgs } from "vs/platform/environment/common/environment"; import { ParsedArgs } from "vs/platform/environment/common/environment";
import { Emitter } from "@coder/events/src"; import { Emitter } from "@coder/events/src";
import { retry } from "@coder/ide/src/retry"; import { retry } from "@coder/ide/src/retry";
import { logger, Level } from "@coder/logger"; import { logger, field, Level } from "@coder/logger";
export enum SharedProcessState { export enum SharedProcessState {
Stopped, Stopped,
@ -30,6 +30,7 @@ export class SharedProcess {
private readonly onStateEmitter = new Emitter<SharedProcessEvent>(); private readonly onStateEmitter = new Emitter<SharedProcessEvent>();
public readonly onState = this.onStateEmitter.event; public readonly onState = this.onStateEmitter.event;
private readonly retryName = "Shared process"; private readonly retryName = "Shared process";
private readonly logger = logger.named("shared");
public constructor( public constructor(
private readonly userDataDir: string, private readonly userDataDir: string,
@ -65,12 +66,34 @@ export class SharedProcess {
state: SharedProcessState.Starting, state: SharedProcessState.Starting,
}); });
let resolved: boolean = false; let resolved: boolean = false;
const maybeStop = (error: string): void => {
if (resolved) {
return;
}
this.setState({
error,
state: SharedProcessState.Stopped,
});
if (!this.activeProcess) {
return;
}
this.activeProcess.kill();
};
this.activeProcess = forkModule("vs/code/electron-browser/sharedProcess/sharedProcessMain", [], { this.activeProcess = forkModule("vs/code/electron-browser/sharedProcess/sharedProcessMain", [], {
env: { env: {
VSCODE_ALLOW_IO: "true", VSCODE_ALLOW_IO: "true",
VSCODE_LOGS: process.env.VSCODE_LOGS, VSCODE_LOGS: process.env.VSCODE_LOGS,
}, },
}); });
if (this.logger.level <= Level.Trace) {
this.activeProcess.stdout.on("data", (data) => {
this.logger.trace(() => ["stdout", field("data", data.toString())]);
});
}
this.activeProcess.on("error", (error) => {
this.logger.error("error", field("error", error));
maybeStop(error.message);
});
this.activeProcess.on("exit", (err) => { this.activeProcess.on("exit", (err) => {
if (this._state !== SharedProcessState.Stopped) { if (this._state !== SharedProcessState.Stopped) {
this.setState({ this.setState({
@ -92,7 +115,7 @@ export class SharedProcess {
"user-data-dir": this.userDataDir, "user-data-dir": this.userDataDir,
"extensions-dir": extensionsDir, "extensions-dir": extensionsDir,
}, },
logLevel: logger.level, logLevel: this.logger.level,
sharedIPCHandle: this.socketPath, sharedIPCHandle: this.socketPath,
}; };
this.ipcHandler!.send("handshake:hey there", "", data); this.ipcHandler!.send("handshake:hey there", "", data);
@ -105,16 +128,8 @@ export class SharedProcess {
}); });
}); });
this.activeProcess.stderr.on("data", (data) => { this.activeProcess.stderr.on("data", (data) => {
if (!resolved) { this.logger.error("stderr", field("data", data.toString()));
this.setState({ maybeStop(data.toString());
error: data.toString(),
state: SharedProcessState.Stopped,
});
if (!this.activeProcess) {
return;
}
this.activeProcess.kill();
}
}); });
} }