Added Windows CPU load indicator
Ylian Saint-Hilaire committed
Apr 2, 2021 at 22:41 UTC
cecab41cff2c2d0634e06070418e8591636a6b50
2 files changed
+2
-2
meshcentral.js
+1
-1
@@ -3074,7 +3074,7 @@ function mainStart() {
3074
3075
// Build the list of required modules
3076
var modules = ['ws', 'cbor@5.2.0', 'nedb', 'https', 'yauzl', 'xmldom', 'ipcheck', 'express', 'archiver@4.0.2', 'multiparty', 'node-forge', 'express-ws', 'compression', 'body-parser', 'connect-redis', 'cookie-session', 'express-handlebars'];
3077
- if (require('os').platform() == 'win32') { modules.push('node-windows'); if (sspi == true) { modules.push('node-sspi'); } } // Add Windows modules
3077
+ if (require('os').platform() == 'win32') { modules.push('node-windows'); modules.push('loadavg-windows'); if (sspi == true) { modules.push('node-sspi'); } } // Add Windows modules
3078
if (ldap == true) { modules.push('ldapauth-fork'); }
3079
if (mstsc == true) { modules.push('node-rdpjs-2'); }
3080
if (passport != null) { modules.push(...passport); }
meshuser.js
+1
-1
@@ -388,8 +388,8 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
388
// Take a look at server stats
389
var os = require('os');
390
var stats = { action: 'serverstats', totalmem: os.totalmem(), freemem: os.freemem() };
391
+ try { stats.cpuavg = os.loadavg(); } catch (ex) { }
392
if (parent.parent.platform != 'win32') {
392
- stats.cpuavg = os.loadavg();
393
try { stats.availablemem = 1024 * Number(/MemAvailable:[ ]+(\d+)/.exec(fs.readFileSync('/proc/meminfo', 'utf8'))[1]); } catch (ex) { }
394
}
395