Ylianst/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2024-11-22 22:17:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Windows Service Stop

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2019-07-17 17:34:34 -07:00
parent 03e57916a8
commit c641b2d585
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
meshcentral.js
View File

@ -169,24 +169,22 @@ function CreateMeshCentralServer(config, args) {
obj.StartEx(); obj.StartEx();
} else { } else {
// if "--launch" is not specified, launch the server as a child process. // if "--launch" is not specified, launch the server as a child process.
var startLine = ''; var startArgs = [];
for (i in process.argv) { for (i in process.argv) {
var arg = process.argv[i]; if (i > 0) {
if (arg.length > 0) { var arg = process.argv[i];
if (startLine.length > 0) startLine += ' '; if ((arg.length > 0) && ((arg.indexOf(' ') >= 0) || (arg.indexOf('&') >= 0))) { startArgs.push('"' + arg + '"'); } else { startArgs.push(arg); }
if ((arg.indexOf(' ') >= 0) || (arg.indexOf('&') >= 0)) { startLine += '"' + arg + '"'; } else { startLine += arg; }
} }
} }
obj.launchChildServer(startLine); startArgs.push('--launch', process.pid);
obj.launchChildServer(startArgs);
} }
}; };
// Launch MeshCentral as a child server and monitor it. // Launch MeshCentral as a child server and monitor it.
obj.launchChildServer = function (startLine) { obj.launchChildServer = function (startArgs) {
if (process.pid) { obj.updateServerState('monitor-pid', process.pid); }
if (process.ppid) { obj.updateServerState('monitor-ppid', process.ppid); }
var child_process = require('child_process'); var child_process = require('child_process');
childProcess = child_process.exec(startLine + ' --launch ' + process.pid, { maxBuffer: Infinity, cwd: obj.parentpath }, function (error, stdout, stderr) { childProcess = child_process.execFile(process.argv[0], startArgs, { maxBuffer: Infinity, cwd: obj.parentpath }, function (error, stdout, stderr) {
if (childProcess.xrestart == 1) { if (childProcess.xrestart == 1) {
setTimeout(function () { obj.launchChildServer(startLine); }, 500); // This is an expected restart. setTimeout(function () { obj.launchChildServer(startLine); }, 500); // This is an expected restart.
} else if (childProcess.xrestart == 2) { } else if (childProcess.xrestart == 2) {
@ -568,7 +566,7 @@ function CreateMeshCentralServer(config, args) {
// Write the server state // Write the server state
obj.updateServerState('state', 'starting'); obj.updateServerState('state', 'starting');
if (process.pid) { obj.updateServerState('server-pid', process.pid); } if (process.pid) { obj.updateServerState('server-pid', process.pid); }
if (process.ppid) { obj.updateServerState('server-ppid', process.ppid); } if (process.ppid) { obj.updateServerState('server-parent-pid', process.ppid); }
// Start memory tracking if requested // Start memory tracking if requested
if (typeof obj.args.memorytracking == 'number') { if (typeof obj.args.memorytracking == 'number') {
@ -1849,10 +1847,12 @@ function mainStart() {
process.on("exit", function () { if (childProcess) { childProcess.kill(); childProcess = null; } }); process.on("exit", function () { if (childProcess) { childProcess.kill(); childProcess = null; } });
// If our parent exits, we also exit // If our parent exits, we also exit
process.stderr.on('end', function () { process.exit(); }); if (args.launch) {
process.stdout.on('end', function () { process.exit(); }); process.stderr.on('end', function () { process.exit(); });
process.stdin.on('end', function () { process.exit(); }); process.stdout.on('end', function () { process.exit(); });
process.stdin.on('data', function (data) { }); process.stdin.on('end', function () { process.exit(); });
process.stdin.on('data', function (data) { });
}
}); });
} }

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "meshcentral", "name": "meshcentral",
"version": "0.3.7-y", "version": "0.3.7-z",
"keywords": [ "keywords": [
"Remote Management", "Remote Management",
"Intel AMT", "Intel AMT",