jeans/arduino-ide
jeans/arduino-ide
1
0
Fork 0
mirror of https://github.com/arduino/arduino-ide.git synced 2025-06-17 17:46:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: do not start obsolete daemon watcher process

Browse Source 
Before arduino/arduino-cli#488, IDE2 required a way to stop the daemon
process if the parent (backend) process crashed. However, this mechanism
is no longer necessary as the CLI daemon process is not actually a true
daemon process.

Signed-off-by: Akos Kitta <a.kitta@arduino.cc>
This commit is contained in:
Akos Kitta 2023-08-20 18:09:48 +02:00 committed by Akos Kitta
parent 2aae9e0a07
commit 57fa18b940
2 changed files with 0 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arduino-ide-extension/src/node/arduino-daemon-impl.ts
View File

@ -10,7 +10,6 @@ import {
} from '@theia/core/lib/common/disposable'; } from '@theia/core/lib/common/disposable';
import { Event, Emitter } from '@theia/core/lib/common/event'; import { Event, Emitter } from '@theia/core/lib/common/event';
import { deepClone } from '@theia/core/lib/common/objects'; import { deepClone } from '@theia/core/lib/common/objects';
import { environment } from '@theia/application-package/lib/environment';
import { EnvVariablesServer } from '@theia/core/lib/common/env-variables'; import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
import { BackendApplicationContribution } from '@theia/core/lib/node/backend-application'; import { BackendApplicationContribution } from '@theia/core/lib/node/backend-application';
import { ArduinoDaemon, NotificationServiceServer } from '../common/protocol'; import { ArduinoDaemon, NotificationServiceServer } from '../common/protocol';
@ -71,22 +70,6 @@ export class ArduinoDaemonImpl
const cliPath = this.getExecPath(); const cliPath = this.getExecPath();
this.onData(`Starting daemon from ${cliPath}...`); this.onData(`Starting daemon from ${cliPath}...`);
const { daemon, port } = await this.spawnDaemonProcess(); const { daemon, port } = await this.spawnDaemonProcess();
// Watchdog process for terminating the daemon process when the backend app terminates.
spawn(
process.execPath,
[
join(__dirname, 'daemon-watcher.js'),
String(process.pid),
String(daemon.pid),
],
{
env: environment.electron.runAsNodeEnv(),
detached: true,
stdio: 'ignore',
windowsHide: true,
}
).unref();
this.toDispose.pushAll([ this.toDispose.pushAll([
Disposable.create(() => { Disposable.create(() => {
if (daemon.pid) { if (daemon.pid) {

22
arduino-ide-extension/src/node/daemon-watcher.ts
View File

@ -1,22 +0,0 @@
import psTree from 'ps-tree';
import kill from 'tree-kill';
const [theiaPid, daemonPid] = process.argv
.slice(2)
.map((id) => Number.parseInt(id, 10));
setInterval(() => {
try {
// Throws an exception if the Theia process doesn't exist anymore.
process.kill(theiaPid, 0);
} catch {
psTree(daemonPid, function (_, children) {
for (const { PID } of children) {
const parsedPid = Number.parseInt(PID, 10);
if (!Number.isNaN(parsedPid)) {
kill(parsedPid);
}
}
kill(daemonPid, () => process.exit());
});
}
}, 1000);