Skip to content

Commit bb3b107

Browse files
authored
Adopt the new server-harness awaitable kill (#74)
1 parent 8a14032 commit bb3b107

File tree

3 files changed

+24
-19
lines changed

3 files changed

+24
-19
lines changed

package-lock.json

Lines changed: 19 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"dependencies": {
1414
"@octokit/rest": "^16.43.2",
1515
"@typescript/github-link": "^0.2.1",
16-
"@typescript/server-harness": "^0.2.1",
16+
"@typescript/server-harness": "^0.3.0",
1717
"@typescript/server-replay": "^0.2.6",
1818
"glob": "^7.2.3",
1919
"json5": "^2.2.1",

src/utils/exerciseServer.ts

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,8 @@ async function exerciseServerWorker(testDir: string, tsserverPath: string, repla
8787
"--expose-gc",
8888
]);
8989

90-
process.once("SIGTERM", () => {
91-
exitExpected = true;
92-
server.kill();
93-
// This is a sneaky way to invoke node's default SIGTERM handler
94-
process.kill(process.pid, "SIGTERM");
95-
});
96-
9790
let loadedNewProject = false;
98-
server.on("event", (e: any) => {
91+
server.on("event", async (e: any) => {
9992
switch (e.event) {
10093
case "projectLoadingFinish":
10194
loadedNewProject = true;
@@ -105,7 +98,7 @@ async function exerciseServerWorker(testDir: string, tsserverPath: string, repla
10598
const languageServiceDisabledProject = e.body.projectName ? path.normalize(e.body.projectName) : "unknown project";
10699
console.error(`Language service disabled for ${languageServiceDisabledProject}`);
107100
exitExpected = true;
108-
server.kill();
101+
await server.kill();
109102
process.exit(EXIT_LANGUAGE_SERVICE_DISABLED);
110103
}
111104
break;
@@ -366,7 +359,7 @@ async function exerciseServerWorker(testDir: string, tsserverPath: string, repla
366359
console.error(e);
367360

368361
exitExpected = true;
369-
server.kill();
362+
await server.kill();
370363
process.exit(EXIT_UNHANDLED_EXCEPTION);
371364
}
372365

@@ -417,7 +410,7 @@ ${JSON.stringify(response, undefined, 2)}`);
417410
console.log(JSON.stringify(response));
418411

419412
exitExpected = true;
420-
server.kill();
413+
await server.kill();
421414
process.exit(EXIT_SERVER_ERROR);
422415
}
423416

0 commit comments

Comments
 (0)