external/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-03-09 15:40:18 +00:00
Code Issues Releases Wiki Activity

Server fixes, mesh agent download now has group name.

Browse source
This commit is contained in:
Ylian Saint-Hilaire 2019-02-25 14:35:08 -08:00
parent caa6dcf27d
commit b6854dd69a
8 changed files with 585 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

24
meshuser.js
View file

@ -188,8 +188,8 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
"Connected Users": Object.keys(obj.parent.wssessions).length,
"Users Sessions": Object.keys(obj.parent.wssessions2).length,
"Relay Sessions": obj.parent.relaySessionCount,
"Relay Errors": obj.parent.relaySessionErrorCount
};
if (obj.parent.relaySessionErrorCount != 0) { serverStats['Relay Errors'] = obj.parent.relaySessionErrorCount; }
if (obj.parent.parent.mpsserver != null) { serverStats['Connected Intel® AMT'] = Object.keys(obj.parent.parent.mpsserver.ciraConnections).length; }
stats.values = { "Server State": serverStats }
try { ws.send(JSON.stringify(stats)); } catch (ex) { }
@ -462,7 +462,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
switch (cmd) {
case 'help': {
r = 'Available commands: help, args, resetserver, showconfig, usersessions.';
r = 'Available commands: help, args, resetserver, showconfig, usersessions, tasklimiter, cores.';
break;
}
case 'args': {
@ -485,6 +485,26 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
process.exit(0);
break;
}
case 'tasklimiter': {
if (obj.parent.parent.taskLimiter != null) {
//var obj = { maxTasks: maxTasks, maxTaskTime: (maxTaskTime * 1000), nextTaskId: 0, currentCount: 0, current: {}, pending: [[], [], []], timer: null };
const tl = obj.parent.parent.taskLimiter;
r += 'MaxTasks: ' + tl.maxTasks + '<br />';
r += 'MaxTaskTime: ' + (tl.maxTaskTime / 1000) + ' seconds<br />';
r += 'NextTaskId: ' + tl.nextTaskId + '<br />';
r += 'CurrentCount: ' + tl.currentCount + '<br />';
var c = [];
for (var i in tl.current) { c.push(i); }
r += 'Current: [' + c.join(', ') + ']<br />';
r += 'Pending (High/Med/Low): ' + tl.pending[0].length + ', ' + tl.pending[1].length + ', ' + tl.pending[2].length + '<br />';
r += 'Timer: ' + (tl.timer != null) + '<br />';
}
break;
}
case 'cores': {
if (obj.parent.parent.defaultMeshCores != null) { for (var i in obj.parent.parent.defaultMeshCores) { r += i + ': ' + obj.parent.parent.defaultMeshCores[i].length + ' bytes<br />'; } }
break;
}
case 'showconfig': {
// Make a copy of the configuration and hide any secrets
var config = obj.common.Clone(obj.parent.parent.config);