mirror of
https://github.com/koush/scrypted.git
synced 2026-06-27 11:50:24 +01:00
server: cleanup runtime worker hooks
This commit is contained in:
4
server/package-lock.json
generated
4
server/package-lock.json
generated
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "@scrypted/server",
|
||||
"version": "0.138.4",
|
||||
"version": "0.138.5",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "@scrypted/server",
|
||||
"version": "0.138.4",
|
||||
"version": "0.138.5",
|
||||
"hasInstallScript": true,
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
|
||||
@@ -450,10 +450,6 @@ export class PluginHost {
|
||||
this.peer.kill('plugin disconnected');
|
||||
};
|
||||
|
||||
this.worker.on('close', () => {
|
||||
logger.log('e', `${this.pluginName} close`);
|
||||
disconnect();
|
||||
});
|
||||
this.worker.on('exit', async (code, signal) => {
|
||||
logger.log('e', `${this.pluginName} exited ${code} ${signal}`);
|
||||
disconnect();
|
||||
|
||||
@@ -17,7 +17,7 @@ export abstract class ChildProcessWorker extends EventEmitter implements Runtime
|
||||
}
|
||||
|
||||
setupWorker() {
|
||||
this.worker.on('close', (code: number | null, signal: NodeJS.Signals | null) => this.emit('close', code, signal));
|
||||
this.worker.on('close', () => this.emit('error', new Error('close')));
|
||||
this.worker.on('disconnect', () => this.emit('error', new Error('disconnect')));
|
||||
this.worker.on('exit', (code, signal) => this.emit('exit', code, signal));
|
||||
this.worker.on('error', e => this.emit('error', e));
|
||||
|
||||
@@ -23,15 +23,12 @@ export interface RuntimeWorker {
|
||||
|
||||
on(event: 'error', listener: (err: Error) => void): this;
|
||||
on(event: 'exit', listener: (code: number | null, signal: NodeJS.Signals | null) => void): this;
|
||||
on(event: 'close', listener: (code: number | null, signal: NodeJS.Signals | null) => void): this;
|
||||
|
||||
once(event: 'error', listener: (err: Error) => void): this;
|
||||
once(event: 'exit', listener: (code: number | null, signal: NodeJS.Signals | null) => void): this;
|
||||
once(event: 'close', listener: (code: number | null, signal: NodeJS.Signals | null) => void): this;
|
||||
|
||||
removeListener(event: 'error', listener: (err: Error) => void): this;
|
||||
removeListener(event: 'exit', listener: (code: number | null, signal: NodeJS.Signals | null) => void): this;
|
||||
removeListener(event: 'close', listener: (code: number | null, signal: NodeJS.Signals | null) => void): this;
|
||||
|
||||
send(message: RpcMessage, reject?: (e: Error) => void, serializationContext?: any): void;
|
||||
|
||||
|
||||
@@ -691,7 +691,6 @@ export class ScryptedRuntime extends PluginHttp<HttpPluginData> {
|
||||
if (pluginHost) {
|
||||
pluginHost.worker.once('error', restart);
|
||||
pluginHost.worker.once('exit', restart);
|
||||
pluginHost.worker.once('close', restart);
|
||||
}
|
||||
else {
|
||||
restart();
|
||||
|
||||
Reference in New Issue
Block a user