MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2024-12-25 22:55:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed unlink() required callback in NodeJS v10.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2019-01-06 20:32:12 -08:00
parent a1883fc178
commit ed5b5cbd34
4 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meshcentral.js
View File

@ -580,12 +580,6 @@ function CreateMeshCentralServer(config, args) {
if (restoreFile) { if (restoreFile) {
obj.debug(1, 'Server stopped, updating settings: ' + restoreFile); obj.debug(1, 'Server stopped, updating settings: ' + restoreFile);
console.log('Updating settings folder...'); console.log('Updating settings folder...');
/*
var unzip = require('unzip');
var rs = obj.fs.createReadStream(restoreFile);
rs.on('end', () => { setTimeout(function () { fs.unlinkSync(restoreFile); process.exit(123); }, 500); });
rs.pipe(unzip.Extract({ path: obj.datapath }));
*/
var yauzl = require("yauzl"); var yauzl = require("yauzl");
yauzl.open(restoreFile, { lazyEntries: true }, function (err, zipfile) { yauzl.open(restoreFile, { lazyEntries: true }, function (err, zipfile) {

4
meshuser.js
View File

@ -384,7 +384,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
for (i in command.names) { for (i in command.names) {
var s = obj.path.join(scpath, command.names[i]), d = obj.path.join(path, command.names[i]); var s = obj.path.join(scpath, command.names[i]), d = obj.path.join(path, command.names[i]);
sendUpdate = false; sendUpdate = false;
copyFile(s, d, function (op) { if (op != null) { obj.fs.unlink(op, function () { obj.parent.parent.DispatchEvent([user._id], obj, 'updatefiles'); }); } else { obj.parent.parent.DispatchEvent([user._id], obj, 'updatefiles'); } }, ((command.fileop == 'move') ? s : null)); copyFile(s, d, function (op) { if (op != null) { obj.fs.unlink(op, function (err) { obj.parent.parent.DispatchEvent([user._id], obj, 'updatefiles'); }); } else { obj.parent.parent.DispatchEvent([user._id], obj, 'updatefiles'); } }, ((command.fileop == 'move') ? s : null));
} }
} }
@ -724,7 +724,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
{ {
// Clear the server error log // Clear the server error log
if ((user.siteadmin & 16) == 0) break; if ((user.siteadmin & 16) == 0) break;
obj.parent.parent.fs.unlink(obj.parent.parent.getConfigFilePath('mesherrors.txt')); obj.parent.parent.fs.unlink(obj.parent.parent.getConfigFilePath('mesherrors.txt'), function (err) { });
break; break;
} }
case 'createmesh': case 'createmesh':

2
package.json
View File

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

2
webserver.js
View File

@ -1125,7 +1125,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
obj.parent.DispatchEvent([user._id], obj, 'updatefiles'); // Fire an event causing this user to update this files obj.parent.DispatchEvent([user._id], obj, 'updatefiles'); // Fire an event causing this user to update this files
}); });
} else { } else {
try { obj.fs.unlink(file.path); } catch (e) { } try { obj.fs.unlink(file.path, function (err) { }); } catch (e) { }
} }
} }
} }