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

Relayed device group fixes.

Browse source
This commit is contained in:
Ylian Saint-Hilaire 2022-04-14 16:41:15 -07:00
parent 77f34bedd3
commit 6b828b10e9
6 changed files with 8 additions and 16422 deletions
Download patch file Download diff file Expand all files Collapse all files

7
meshuser.js
View file

@ -2907,7 +2907,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
event.msg = ': ';
// If we are in WAN-only mode, host is not used
if ((args.wanonly == true) && (command.host)) { delete command.host; }
if ((args.wanonly == true) && (command.host) && (node.mtype != 3) && (node.mtype != 4)) { delete command.host; }
// Look for a change
if ((typeof command.icon == 'number') && (command.icon != node.icon)) { change = 1; node.icon = command.icon; changes.push('icon'); }
@ -6674,7 +6674,10 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
try { info.uptime = process.uptime(); } catch (ex) { }
try { info.cpuUsage = process.cpuUsage(); } catch (ex) { }
try { info.memoryUsage = process.memoryUsage(); } catch (ex) { }
try { info.warnings = parent.parent.getServerWarnings(); } catch (ex) { }
try {
info.warnings = parent.parent.getServerWarnings();
console.log(info.warnings);
} catch (ex) { console.log(ex); }
try { info.allDevGroupManagers = parent.parent.config.settings.managealldevicegroups; } catch (ex) { }
try { if (process.traceDeprecation == true) { info.traceDeprecation = true; } } catch (ex) { }
cmdData.result = JSON.stringify(info, null, 4);