From cecab41cff2c2d0634e06070418e8591636a6b50 Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Fri, 2 Apr 2021 22:41:51 -0700 Subject: [PATCH] Added Windows CPU load indicator --- meshcentral.js | 2 +- meshuser.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meshcentral.js b/meshcentral.js index 23cecc79..899741fd 100644 --- a/meshcentral.js +++ b/meshcentral.js @@ -3074,7 +3074,7 @@ function mainStart() { // Build the list of required modules 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']; - if (require('os').platform() == 'win32') { modules.push('node-windows'); if (sspi == true) { modules.push('node-sspi'); } } // Add Windows modules + if (require('os').platform() == 'win32') { modules.push('node-windows'); modules.push('loadavg-windows'); if (sspi == true) { modules.push('node-sspi'); } } // Add Windows modules if (ldap == true) { modules.push('ldapauth-fork'); } if (mstsc == true) { modules.push('node-rdpjs-2'); } if (passport != null) { modules.push(...passport); } diff --git a/meshuser.js b/meshuser.js index 45e8346b..ffc30ec9 100644 --- a/meshuser.js +++ b/meshuser.js @@ -388,8 +388,8 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use // Take a look at server stats var os = require('os'); var stats = { action: 'serverstats', totalmem: os.totalmem(), freemem: os.freemem() }; + try { stats.cpuavg = os.loadavg(); } catch (ex) { } if (parent.parent.platform != 'win32') { - stats.cpuavg = os.loadavg(); try { stats.availablemem = 1024 * Number(/MemAvailable:[ ]+(\d+)/.exec(fs.readFileSync('/proc/meminfo', 'utf8'))[1]); } catch (ex) { } }