Fixed device group stat counter
Ylian Saint-Hilaire committed
May 15, 2020 at 15:39 UTC
f0ea1c89d334325b14030c65a19d2f00813fb99e
2 files changed
+6
-2
meshuser.js
+5
-1
@@ -328,9 +328,13 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
328
var os = require('os');
329
var stats = { action: 'serverstats', totalmem: os.totalmem(), freemem: os.freemem() };
330
if (parent.parent.platform != 'win32') { stats.cpuavg = os.loadavg(); }
331
+
332
+ // Count the number of device groups that are not deleted
333
+ var activeDeviceGroups = 0;
334
+ for (var i in parent.meshes) { if (parent.meshes[i].deleted == null) { activeDeviceGroups++; } } // This is not ideal for performance, we want to dome something better.
335
var serverStats = {
336
UserAccounts: Object.keys(parent.users).length,
333
- DeviceGroups: Object.keys(parent.meshes).length,
337
+ DeviceGroups: activeDeviceGroups,
338
AgentSessions: Object.keys(parent.wsagents).length,
339
ConnectedUsers: Object.keys(parent.wssessions).length,
340
UsersSessions: Object.keys(parent.wssessions2).length,
translate/translate.json
+1
-1
@@ -31090,4 +31090,4 @@
31090
]
31091
}
31092
]
31093
-}
31093
+}
\ No newline at end of file