Skip to content

Commit

Permalink
fix leaking java debug process
Browse files Browse the repository at this point in the history
When start debugging using vscode java-debug extension,
the debug process will remain in OS process list and
never be killed by theia process if the page is reloaded.

When terminate plugin server, kill all child processes
of plugin-host process.

Signed-off-by: tom-shan <[email protected]>
  • Loading branch information
tom-shan authored and tom-shan committed Jun 22, 2019
1 parent c8dc139 commit 5ecbe58
Showing 1 changed file with 18 additions and 2 deletions.
20 changes: 18 additions & 2 deletions packages/plugin-ext/src/hosted/node/hosted-plugin-process.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,15 @@
import * as path from 'path';
import * as cp from 'child_process';
import { injectable, inject, named } from 'inversify';
import { ILogger, ConnectionErrorHandler, ContributionProvider } from '@theia/core/lib/common';
import { ILogger, ConnectionErrorHandler, ContributionProvider, isWindows } from '@theia/core/lib/common';
import { Emitter } from '@theia/core/lib/common/event';
import { createIpcEnv } from '@theia/core/lib/node/messaging/ipc-protocol';
import { HostedPluginClient, ServerPluginRunner, PluginMetadata, PluginHostEnvironmentVariable } from '../../common/plugin-protocol';
import { RPCProtocolImpl } from '../../api/rpc-protocol';
import { MAIN_RPC_CONTEXT } from '../../api/plugin-api';
import { HostedPluginCliContribution } from './hosted-plugin-cli-contribution';
import {HostedPluginProcessesCache} from './hosted-plugin-processes-cache';
const psTree = require('ps-tree');

export interface IPCConnectionOptions {
readonly serverName: string;
Expand Down Expand Up @@ -122,11 +123,26 @@ export class HostedPluginProcess implements ServerPluginRunner {
const hostedPluginManager = rpc.getProxy(MAIN_RPC_CONTEXT.HOSTED_PLUGIN_MANAGER_EXT);
hostedPluginManager.$stopPlugin('').then(() => {
emitter.dispose();
cp.kill();
this.killProcessTree(cp);
});

}

private killProcessTree(parentProcess: cp.ChildProcess): void {
parentProcess.disconnect();
const parentPid = parentProcess.pid;
if (isWindows) {
cp.spawn('taskkill', ['/F', '/T', '/PID', parentPid.toString()]);
} else {
// tslint:disable-next-line:no-any
psTree(parentPid, (err: Error, children: Array<any>) => {
parentProcess.kill();
// tslint:disable-next-line:no-any
cp.spawn('kill', children.map((p: any) => p.PID));
});
}
}

public runPluginServer(): void {
if (this.childProcess) {
this.terminatePluginServer();
Expand Down

0 comments on commit 5ecbe58

Please sign in to comment.