mirror of
https://github.com/GNS3/gns3-web-ui.git
synced 2024-12-19 21:17:51 +00:00
Stopping all local servers when leaving application
This commit is contained in:
parent
6759568933
commit
16185d2461
@ -8,7 +8,6 @@ const isWin = /^win/.test(process.platform);
|
||||
|
||||
let runningServers = {};
|
||||
|
||||
|
||||
exports.getLocalServerPath = async () => {
|
||||
const distDirectory = path.join(__dirname, 'dist');
|
||||
if (!fs.existsSync(distDirectory)) {
|
||||
@ -51,13 +50,17 @@ exports.getRunningServers = () => {
|
||||
return Object.keys(runningServers);
|
||||
}
|
||||
|
||||
exports.stopAllLocalServers = async () => {
|
||||
return await stopAll();
|
||||
}
|
||||
|
||||
function getServerArguments(server, overrides) {
|
||||
let serverArguments = [];
|
||||
return serverArguments;
|
||||
let serverArguments = [];
|
||||
return serverArguments;
|
||||
}
|
||||
|
||||
function getChannelForServer(server) {
|
||||
return `local-server-run-${server.name}`;
|
||||
return `local-server-run-${server.name}`;
|
||||
}
|
||||
|
||||
function notifyStatus(status) {
|
||||
@ -66,7 +69,7 @@ function notifyStatus(status) {
|
||||
|
||||
async function stopAll() {
|
||||
for(var serverName in runningServers) {
|
||||
let result, error = await stop(serverName);
|
||||
let result, error = await stop(serverName);
|
||||
}
|
||||
console.log(`Stopped all servers`);
|
||||
}
|
||||
@ -159,38 +162,41 @@ async function run(server, options) {
|
||||
|
||||
});
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
async function main() {
|
||||
await run({
|
||||
name: 'my-local',
|
||||
path: 'c:\\Program Files\\GNS3\\gns3server.EXE',
|
||||
port: 3080
|
||||
}, {
|
||||
logStdout: true
|
||||
});
|
||||
await run({
|
||||
name: 'my-local',
|
||||
path: 'c:\\Program Files\\GNS3\\gns3server.EXE',
|
||||
port: 3080
|
||||
}, {
|
||||
logStdout: true
|
||||
});
|
||||
}
|
||||
|
||||
ipcMain.on('local-server-run', async function (event, server) {
|
||||
const responseChannel = getChannelForServer();
|
||||
await run(server);
|
||||
event.sender.send(responseChannel, {
|
||||
success: true
|
||||
});
|
||||
const responseChannel = getChannelForServer();
|
||||
await run(server);
|
||||
event.sender.send(responseChannel, {
|
||||
success: true
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
ipcMain.on('before-quit', async function (event) {
|
||||
console.log(event);
|
||||
});
|
||||
|
||||
if (require.main === module) {
|
||||
process.on('SIGINT', function() {
|
||||
console.log("Caught interrupt signal");
|
||||
stopAll();
|
||||
});
|
||||
process.on('SIGINT', function() {
|
||||
console.log("Caught interrupt signal");
|
||||
stopAll();
|
||||
});
|
||||
|
||||
process.on('unhandledRejection', (reason, promise) => {
|
||||
console.log(`UnhandledRejection occured 'reason'`);
|
||||
process.exit(1);
|
||||
});
|
||||
process.on('unhandledRejection', (reason, promise) => {
|
||||
console.log(`UnhandledRejection occured 'reason'`);
|
||||
process.exit(1);
|
||||
});
|
||||
|
||||
main();
|
||||
main();
|
||||
}
|
3
main.js
3
main.js
@ -59,13 +59,14 @@ function createWindow () {
|
||||
}
|
||||
|
||||
// Emitted when the window is closed.
|
||||
mainWindow.on('closed', function () {
|
||||
mainWindow.on('closed',async function () {
|
||||
// Dereference the window object, usually you would store windows
|
||||
// in an array if your app supports multi windows, this is the time
|
||||
// when you should delete the corresponding element.
|
||||
mainWindow = null
|
||||
});
|
||||
|
||||
|
||||
// forward event to renderer
|
||||
electron.ipcMain.on('local-server-status-events', (event) => {
|
||||
mainWindow.webContents.send('local-server-status-events', event);
|
||||
|
@ -138,7 +138,10 @@ export class AddServerDialogComponent implements OnInit {
|
||||
}
|
||||
|
||||
getDefaultLocalServerPath() {
|
||||
return this.electronService.remote.require('./local-server.js').getLocalServerPath();
|
||||
if(this.electronService.isElectronApp) {
|
||||
return this.electronService.remote.require('./local-server.js').getLocalServerPath();
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
|
@ -16,7 +16,7 @@ class ElectronServiceMock {
|
||||
public isElectronApp: boolean;
|
||||
}
|
||||
|
||||
describe('DefaultLayoutComponent', () => {
|
||||
fdescribe('DefaultLayoutComponent', () => {
|
||||
let component: DefaultLayoutComponent;
|
||||
let fixture: ComponentFixture<DefaultLayoutComponent>;
|
||||
let electronServiceMock: ElectronServiceMock;
|
||||
@ -89,4 +89,25 @@ describe('DefaultLayoutComponent', () => {
|
||||
});
|
||||
expect(toaster.errors).toEqual([]);
|
||||
});
|
||||
|
||||
describe('auto stopping servers', () => {
|
||||
let event;
|
||||
beforeEach(() => {
|
||||
event = new Event('onbeforeunload');
|
||||
});
|
||||
|
||||
it('should close window with no action when not in electron', async () => {
|
||||
component.shouldStopServersOnClosing = false;
|
||||
const isClosed = await component.onBeforeUnload(event);
|
||||
expect(isClosed).toBeUndefined();
|
||||
});
|
||||
|
||||
it('should stop all servers and close window', () => {
|
||||
component.shouldStopServersOnClosing = true;
|
||||
const isClosed = component.onBeforeUnload(event);
|
||||
expect(isClosed).toBeTruthy();
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
});
|
||||
|
@ -1,8 +1,9 @@
|
||||
import { ElectronService } from 'ngx-electron';
|
||||
import { Component, OnInit, ViewEncapsulation, OnDestroy } from '@angular/core';
|
||||
import { Component, OnInit, ViewEncapsulation, OnDestroy, HostListener } from '@angular/core';
|
||||
import { ServerManagementService } from '../../services/server-management.service';
|
||||
import { Subscription } from 'rxjs';
|
||||
import { ToasterService } from '../../services/toaster.service';
|
||||
import { ProgressService } from '../../common/progress/progress.service';
|
||||
|
||||
@Component({
|
||||
selector: 'app-default-layout',
|
||||
@ -14,22 +15,42 @@ export class DefaultLayoutComponent implements OnInit, OnDestroy {
|
||||
public isInstalledSoftwareAvailable = false;
|
||||
|
||||
serverStatusSubscription: Subscription;
|
||||
shouldStopServersOnClosing = true;
|
||||
|
||||
constructor(
|
||||
private electronService: ElectronService,
|
||||
private serverManagement: ServerManagementService,
|
||||
private toasterService: ToasterService
|
||||
private toasterService: ToasterService,
|
||||
private progressService: ProgressService
|
||||
) {}
|
||||
|
||||
ngOnInit() {
|
||||
this.isInstalledSoftwareAvailable = this.electronService.isElectronApp;
|
||||
|
||||
// attach to notification stream when any of running local servers experienced issues
|
||||
this.serverStatusSubscription = this.serverManagement.serverStatusChanged.subscribe((serverStatus) => {
|
||||
if(serverStatus.status === 'errored') {
|
||||
this.toasterService.error(serverStatus.message);
|
||||
}
|
||||
});
|
||||
|
||||
// stop servers only when in Electron
|
||||
this.shouldStopServersOnClosing = this.electronService.isElectronApp;
|
||||
}
|
||||
|
||||
@HostListener('window:beforeunload', ['$event'])
|
||||
async onBeforeUnload($event) {
|
||||
if(!this.shouldStopServersOnClosing) {
|
||||
return;
|
||||
}
|
||||
$event.preventDefault()
|
||||
$event.returnValue = false;
|
||||
this.progressService.activate();
|
||||
await this.serverManagement.stopAll();
|
||||
this.shouldStopServersOnClosing = false;
|
||||
this.progressService.deactivate();
|
||||
window.close();
|
||||
return false;
|
||||
}
|
||||
|
||||
ngOnDestroy() {
|
||||
|
@ -29,15 +29,22 @@ export class ServerManagementService implements OnDestroy {
|
||||
}
|
||||
|
||||
async start(server: Server) {
|
||||
await this.electronService.remote.require('./local-server.js').startLocalServer(server);
|
||||
return await this.electronService.remote.require('./local-server.js').startLocalServer(server);
|
||||
}
|
||||
|
||||
async stop(server: Server) {
|
||||
await this.electronService.remote.require('./local-server.js').stopLocalServer(server);
|
||||
return await this.electronService.remote.require('./local-server.js').stopLocalServer(server);
|
||||
}
|
||||
|
||||
async stopAll() {
|
||||
return await this.electronService.remote.require('./local-server.js').stopAllLocalServers();
|
||||
}
|
||||
|
||||
getRunningServers() {
|
||||
return this.electronService.remote.require('./local-server.js').getRunningServers();
|
||||
if(this.electronService.isElectronApp) {
|
||||
return this.electronService.remote.require('./local-server.js').getRunningServers();
|
||||
}
|
||||
return [];
|
||||
}
|
||||
|
||||
ngOnDestroy() {
|
||||
|
Loading…
Reference in New Issue
Block a user