Rework faulty callback concept in ProcessManagerService

This commit is contained in:
Kristóf Tóth 2018-02-27 16:06:15 +01:00
parent ceabfe75bc
commit 0779ad2ef6
2 changed files with 9 additions and 11 deletions

View File

@ -21,22 +21,19 @@ export class ProcessManagerService {
.pipe(filter(message => message.data.process_name === process_name)).subscribe(callback);
}
sendCommand(command: string, process_name: string, callback?: (event: any) => void) {
if (callback) {
this.subscribeCallback(process_name, callback);
}
sendCommand(command: string, process_name: string) {
this.webSocketService.send(this.key, {'command': command, 'process_name': process_name});
}
startProcess(process_name: string, callback?: (event: any) => void) {
this.sendCommand('start', process_name, callback);
startProcess(process_name: string) {
this.sendCommand('start', process_name);
}
stopProcess(process_name: string, callback?: (event: any) => void) {
this.sendCommand('stop', process_name, callback);
stopProcess(process_name: string) {
this.sendCommand('stop', process_name);
}
restartProcess(process_name: string, callback?: (event: any) => void) {
this.sendCommand('restart', process_name, callback);
restartProcess(process_name: string) {
this.sendCommand('restart', process_name);
}
}

View File

@ -47,6 +47,7 @@ export class WebideComponent implements OnInit {
this.subscribeWS();
this.requestCode();
this.processManagerService.init();
this.processManagerService.subscribeCallback('login', (event) => { console.log('CICÁK!!'); });
}
subscribeWS() {
@ -89,7 +90,7 @@ export class WebideComponent implements OnInit {
'content': this.code
});
this.saveButtonState = 'SAVING';
this.processManagerService.restartProcess('login', (event) => { console.log('CICÁK!!'); });
this.processManagerService.restartProcess('login');
}
requestCode() {