Ylianst/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2024-12-25 23:15:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed server update on windows.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2019-07-17 13:07:52 -07:00
parent b4fef4bc2c
commit 7fec856c9d
2 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
meshcentral.js
View File

@ -136,7 +136,23 @@ function CreateMeshCentralServer(config, args) {
var svc = new obj.service({ name: 'MeshCentral', description: 'MeshCentral Remote Management Server', script: obj.path.join(__dirname, 'winservice.js'), env: env, wait: 2, grow: 0.5 }); var svc = new obj.service({ name: 'MeshCentral', description: 'MeshCentral Remote Management Server', script: obj.path.join(__dirname, 'winservice.js'), env: env, wait: 2, grow: 0.5 });
svc.on('install', function () { console.log('MeshCentral service installed.'); svc.start(); }); svc.on('install', function () { console.log('MeshCentral service installed.'); svc.start(); });
svc.on('uninstall', function () { console.log('MeshCentral service uninstalled.'); process.exit(); }); svc.on('uninstall', function () { console.log('MeshCentral service uninstalled.'); process.exit(); });
svc.on('start', function () { console.log('MeshCentral service started.'); process.exit(); }); svc.on('start', function () {
console.log('MeshCentral service started.');
// Attempt to copy the demon folder to "meshcentral-data\win-deamon".
try {
var sourceDaemonFolder = obj.path.join(__dirname, 'daemon');
var targetDaemonFolder = obj.path.join(obj.datapath, 'win-deamon');
if (!obj.fs.existsSync(targetDaemonFolder)) { obj.fs.mkdirSync(targetDaemonFolder); }
var files = obj.fs.readdirSync(sourceDaemonFolder);
for (var i in files) {
if (files[i].endsWith('.log') == false) {
var bin = obj.fs.readFileSync(obj.path.join(sourceDaemonFolder, files[i]), 'binary');
obj.fs.writeFileSync(obj.path.join(targetDaemonFolder, files[i]), bin, 'binary');
}
}
} catch (e) { console.error(e); }
process.exit();
});
svc.on('stop', function () { console.log('MeshCentral service stopped.'); if (obj.args.stop) { process.exit(); } if (obj.args.restart) { console.log('Holding 5 seconds...'); setTimeout(function () { svc.start(); }, 5000); } }); svc.on('stop', function () { console.log('MeshCentral service stopped.'); if (obj.args.stop) { process.exit(); } if (obj.args.restart) { console.log('Holding 5 seconds...'); setTimeout(function () { svc.start(); }, 5000); } });
svc.on('alreadyinstalled', function () { console.log('MeshCentral service already installed.'); process.exit(); }); svc.on('alreadyinstalled', function () { console.log('MeshCentral service already installed.'); process.exit(); });
svc.on('invalidinstallation', function () { console.log('Invalid MeshCentral service installation.'); process.exit(); }); svc.on('invalidinstallation', function () { console.log('Invalid MeshCentral service installation.'); process.exit(); });
@ -184,7 +200,26 @@ function CreateMeshCentralServer(config, args) {
xxprocess.data = ''; xxprocess.data = '';
xxprocess.stdout.on('data', function (data) { xxprocess.data += data; }); xxprocess.stdout.on('data', function (data) { xxprocess.data += data; });
xxprocess.stderr.on('data', function (data) { xxprocess.data += data; }); xxprocess.stderr.on('data', function (data) { xxprocess.data += data; });
xxprocess.on('close', function (code) { console.log('Update completed...'); setTimeout(function () { obj.launchChildServer(startLine); }, 1000); }); xxprocess.on('close', function (code) {
console.log('Update completed...');
if (require('os').platform() == 'win32') {
// On Windows, attempt to copy "meshcentral-data\win-deamon" folder back into "deamon".
// This folder will have been removed after update and needs to be added back.
try {
var sourceDaemonFolder = obj.path.join(obj.datapath, 'win-deamon');
var targetDaemonFolder = obj.path.join(__dirname, 'daemon');
if (!obj.fs.existsSync(targetDaemonFolder)) { obj.fs.mkdirSync(targetDaemonFolder); }
var files = obj.fs.readdirSync(sourceDaemonFolder);
for (var i in files) {
if (files[i].endsWith('.log') == false) {
var bin = obj.fs.readFileSync(obj.path.join(sourceDaemonFolder, files[i]), 'binary');
obj.fs.writeFileSync(obj.path.join(targetDaemonFolder, files[i]), bin, 'binary');
}
}
} catch (e) { console.error(e); }
}
setTimeout(function () { obj.launchChildServer(startLine); }, 1000);
});
} else { } else {
if (error != null) { if (error != null) {
// This is an un-expected restart // This is an un-expected restart

2
package.json
View File

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