Skip to content

Commit 1fec316

Browse files
code-asherkylecarbs
authored andcommitted
Centralize fork logging
1 parent 570aece commit 1fec316

File tree

3 files changed

+47
-33
lines changed

3 files changed

+47
-33
lines changed

packages/server/src/server.ts

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -44,33 +44,13 @@ export const createApp = (registerMiddleware?: (app: express.Application) => voi
4444
const server = new Server(connection, options ? {
4545
...options,
4646
forkProvider: (message: NewSessionMessage): ChildProcess => {
47-
const command = message.getCommand();
48-
const childLogger = logger.named(command.split("/").pop()!);
49-
childLogger.debug("Forking...", field("module", command));
50-
5147
let proc: ChildProcess;
5248
if (message.getIsBootstrapFork()) {
53-
proc = forkModule(command);
49+
proc = forkModule(message.getCommand());
5450
} else {
5551
throw new Error("No support for non bootstrap-forking yet");
5652
}
5753

58-
proc.stdout.on("data", (message) => {
59-
childLogger.debug("stdout", field("message", message.toString().trim()));
60-
});
61-
62-
proc.stderr.on("data", (message) => {
63-
childLogger.debug("stderr", field("message", message.toString().trim()));
64-
});
65-
66-
proc.stdin.on("data", (message) => {
67-
childLogger.debug("stdin", field("message", message.toString().trim()));
68-
});
69-
70-
proc.on("exit", (exitCode) => {
71-
childLogger.debug(`Exited with ${exitCode}`);
72-
});
73-
7454
return proc;
7555
},
7656
} : undefined);

packages/server/src/vscode/bootstrapFork.ts

Lines changed: 45 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import * as cp from "child_process";
22
import * as fs from "fs";
33
import * as path from "path";
4+
import { logger, field } from "@coder/logger/src";
45

56
declare var __non_webpack_require__: typeof require;
67

@@ -14,16 +15,55 @@ export const requireModule = (modulePath: string): void => {
1415
/**
1516
* Uses the internal bootstrap-fork.js to load a module
1617
* @example
17-
* const cp = forkModule("vs/code/electron-browser/sharedProcess/sharedProcessMain");
18+
* const cp = forkModule("vs/code/electron-browser/sharedProcess/sharedProcessMain", true);
1819
* cp.stdout.on("data", (data) => console.log(data.toString("utf8")));
1920
* cp.stderr.on("data", (data) => console.log(data.toString("utf8")));
20-
* @param modulePath
21+
* @param modulePath Path of the VS Code module to load.
22+
* @param stdio Whether to use stdio (spawn) or send/onMessage (fork).
2123
*/
22-
export const forkModule = (modulePath: string): cp.ChildProcess => {
24+
export const forkModule = (modulePath: string, stdio?: boolean): cp.ChildProcess => {
25+
const basename = modulePath.split("/").pop()!;
26+
let i = 0;
27+
for (; i < basename.length; i++) {
28+
const character = basename.charAt(i);
29+
if (character === character.toUpperCase()) {
30+
break;
31+
}
32+
}
33+
const childLogger = logger.named(basename.substring(0, i));
34+
childLogger.debug("Forking...", field("module", modulePath));
35+
36+
let proc: cp.ChildProcess | undefined;
37+
2338
const args = ["--bootstrap-fork", modulePath];
2439
if (process.env.CLI === "true") {
25-
return cp.spawn(process.execPath, args);
40+
proc = stdio ? cp.spawn(process.execPath, args) : cp.fork(process.execPath, args);
41+
} else if (stdio) {
42+
proc = cp.spawn("npm", ["start", "--scripts-prepend-node-path", "--", ...args]);
2643
} else {
27-
return cp.spawn("npm", ["start", "--scripts-prepend-node-path", "--", ...args]);
44+
// TODO: need to fork somehow so we get send/onMessage.
45+
proc = cp.spawn("npm", ["start", "--scripts-prepend-node-path", "--", ...args]);
2846
}
47+
48+
proc.stdout.on("data", (message) => {
49+
childLogger.debug("stdout", field("message", message.toString().trim()));
50+
});
51+
52+
proc.stderr.on("data", (message) => {
53+
childLogger.debug("stderr", field("message", message.toString().trim()));
54+
});
55+
56+
proc.stdin.on("data", (message) => {
57+
childLogger.debug("stdin", field("message", message.toString().trim()));
58+
});
59+
60+
proc.on("message", (message) => {
61+
childLogger.debug("message", field("message", message.toString().trim()));
62+
});
63+
64+
proc.on("exit", (exitCode) => {
65+
childLogger.debug(`Exited with ${exitCode}`);
66+
});
67+
68+
return proc;
2969
};

packages/server/src/vscode/sharedProcess.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import * as os from "os";
44
import * as path from "path";
55
import { forkModule } from "./bootstrapFork";
66
import { StdioIpcHandler } from "../ipc";
7-
import { logger, field } from "@coder/logger/src";
87
import { ParsedArgs } from "vs/platform/environment/common/environment";
98
import { LogLevel } from "vs/platform/log/common/log";
109
import { Emitter, Event } from '@coder/events/src';
@@ -29,7 +28,6 @@ export class SharedProcess {
2928
private activeProcess: ChildProcess | undefined;
3029
private ipcHandler: StdioIpcHandler | undefined;
3130
private readonly onStateEmitter: Emitter<SharedProcessEvent>;
32-
private readonly logger = logger.named("SHRD PROC");
3331

3432
public constructor(
3533
private readonly userDataDir: string,
@@ -68,7 +66,7 @@ export class SharedProcess {
6866
state: SharedProcessState.Starting,
6967
});
7068
let resolved: boolean = false;
71-
this.activeProcess = forkModule("vs/code/electron-browser/sharedProcess/sharedProcessMain");
69+
this.activeProcess = forkModule("vs/code/electron-browser/sharedProcess/sharedProcessMain", true);
7270
this.activeProcess.on("exit", (err) => {
7371
if (this._state !== SharedProcessState.Stopped) {
7472
this.setState({
@@ -101,11 +99,7 @@ export class SharedProcess {
10199
state: SharedProcessState.Ready,
102100
});
103101
});
104-
this.activeProcess.stdout.on("data", (data) => {
105-
this.logger.debug("stdout", field("message", data.toString()));
106-
});
107102
this.activeProcess.stderr.on("data", (data) => {
108-
this.logger.debug("stderr", field("message", data.toString()));
109103
if (!resolved) {
110104
this.setState({
111105
error: data.toString(),

0 commit comments

Comments
 (0)