MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-18 09:13:14 +00:00
Code Issues Releases Wiki Activity

Updated service-manager for MacOS to better tolerate KeepAlive settings

Browse Source
This commit is contained in:
Bryan Roe
2019-04-19 14:22:28 -07:00
parent 6e543689f5
commit c64a726f2d
2 changed files with 49 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
microscript/ILibDuktape_Polyfills.c
View File

File diff suppressed because one or more lines are too long

41
modules/service-manager.js
View File

@@ -370,19 +370,33 @@ function serviceManager()
return (child.stdout.str.trim().toUpperCase() == "TRUE"); return (child.stdout.str.trim().toUpperCase() == "TRUE");
})() })()
}); });
Object.defineProperty(ret, "_keepAlive", {
value: (function ()
ret.label = function label()
{ {
var child = require('child_process').execFile('/bin/sh', ['sh']); var child = require('child_process').execFile('/bin/sh', ['sh']);
child.stdout.str = ''; child.stdout.str = '';
child.stdout.on('data', function (chunk) { this.str += chunk.toString(); }); child.stdout.on('data', function (chunk) { this.str += chunk.toString(); });
child.stdin.write("cat " + this.plist + " | tr '\n' '\.' | awk '{ split($0, a, \"<key>Label</key>\"); split(a[2], b, \"</string>\"); split(b[1], c, \"<string>\"); print c[2]; }'\nexit\n"); child.stdin.write("cat " + ret.plist + " | tr '\n' '\.' | awk '{split($0, a, \"<key>KeepAlive</key>\"); split(a[2], b, \"<\"); split(b[2], c, \">\"); ");
child.stdin.write(" if(c[1]==\"dict\"){ split(a[2], d, \"</dict>\"); if(split(d[1], truval, \"<true/>\")>1) { split(truval[1], kn1, \"<key>\"); split(kn1[2], kn2, \"</key>\"); print kn2[1]; } }");
child.stdin.write(" else { split(c[1], ka, \"/\"); if(ka[1]==\"true\") {print \"ALWAYS\";} } }'\nexit\n");
child.waitExit(); child.waitExit();
return (child.stdout.str.trim()); return (child.stdout.str.trim());
})()
});
if (!ret.alias)
{
Object.defineProperty(ret, 'alias', {
value: (function ()
{
var child = require('child_process').execFile('/bin/sh', ['sh']);
child.stdout.str = '';
child.stdout.on('data', function (chunk) { this.str += chunk.toString(); });
child.stdin.write("cat " + ret.plist + " | tr '\n' '\.' | awk '{ split($0, a, \"<key>Label</key>\"); split(a[2], b, \"</string>\"); split(b[1], c, \"<string>\"); print c[2]; }'\nexit\n");
child.waitExit();
return (child.stdout.str.trim());
})()
});
} }
if (!ret.alias) { Object.defineProperty(ret, 'alias', { value: ret.label() }); }
ret.label = null;
ret.getPID = function getPID() ret.getPID = function getPID()
{ {
var child = require('child_process').execFile('/bin/sh', ['sh']); var child = require('child_process').execFile('/bin/sh', ['sh']);
@@ -425,16 +439,24 @@ function serviceManager()
var child = require('child_process').execFile('/bin/sh', ['sh']); var child = require('child_process').execFile('/bin/sh', ['sh']);
child.stdout.on('data', function (chunk) { }); child.stdout.on('data', function (chunk) { });
child.stdin.write('launchctl load ' + this.plist + '\n'); child.stdin.write('launchctl load ' + this.plist + '\n');
if (!this._runAtLoad) { child.stdin.write('launchctl start ' + this.alias + '\n'); } child.stdin.write('launchctl start ' + this.alias + '\n');
child.stdin.write('exit\n'); child.stdin.write('exit\n');
child.waitExit(); child.waitExit();
console.log('done');
}; };
ret.stop = function stop() ret.stop = function stop()
{ {
var child = require('child_process').execFile('/bin/sh', ['sh']); var child = require('child_process').execFile('/bin/sh', ['sh']);
child.stdout.on('data', function (chunk) { }); child.stdout.on('data', function (chunk) { });
if (this._keepAlive == 'Crashed' || this._keepAlive == '')
{
// We can call stop, so the service can stay loaded, so scheduled jobs will still work
child.stdin.write('launchctl stop ' + this.alias + '\nexit\n');
}
else
{
// We must unload, otherwise the service is likely to just restart on it's own.
child.stdin.write('launchctl unload ' + this.plist + '\nexit\n'); child.stdin.write('launchctl unload ' + this.plist + '\nexit\n');
}
child.waitExit(); child.waitExit();
}; };
ret.restart = function restart() ret.restart = function restart()
@@ -962,7 +984,10 @@ function serviceManager()
plist += ' <key>KeepAlive</key>\n'; plist += ' <key>KeepAlive</key>\n';
if(options.failureRestart == null || options.failureRestart > 0) if(options.failureRestart == null || options.failureRestart > 0)
{ {
plist += ' <dict>\n';
plist += ' <key>Crashed</key>\n';
plist += ' <true/>\n'; plist += ' <true/>\n';
plist += ' </dict>\n';
} }
else else
{ {