MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2026-01-18 16:33:31 +00:00
Code Issues Releases Wiki Activity

GC reference update

Browse Source
This commit is contained in:
Bryan Roe
2021-03-13 21:12:36 -08:00
parent 838ae01a92
commit d976b0818a
6 changed files with 152 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/monitor-info.js
View File

@@ -34,6 +34,12 @@ var PropertyChangeMask = (1 << 22);
var PropertyNotify = 28;
var AnyPropertyType = 0;
function stdparser(c)
{
if (this.str == null) { this.str = ''; }
this.str += c.toString();
}
function getLibInfo(libname)
{
var child = require('child_process').execFile('/bin/sh', ['sh']);
@@ -499,7 +505,7 @@ function monitorinfo()
if (process.platform != 'linux') { return(info); }
var child = require('child_process').execFile('/bin/sh', ['sh']);
child.stdout.str = '';
child.stdout.on('data', function (chunk) { this.str += chunk.toString(); });
child.stdout.on('data', stdparser);
child.stdin.write("ps -e -o uid -o cmd | grep X | grep " + uid + " | tr '\\n' '`' | awk '{ xl=split($2,x,\"/\"); print x[xl]; }'\nexit\n");
child.waitExit();
if(child.stdout.str.trim() != '')
@@ -571,11 +577,13 @@ function monitorinfo()
// We need to find $DISPLAY by looking at all the processes running on the same tty as the XServer instance for this user session
child = require('child_process').execFile('/bin/sh', ['sh']);
child.stdout.str = '';
child.stdout.on('data', function (chunk) { this.str += chunk.toString(); });
child.stdout.on('data', stdparser);
child.stdin.write("ps -e -o tty -o pid -o user:9999 | grep " + ret.tty + " | grep " + uname + " | awk '{ print $2 }' \nexit\n");
child.waitExit();
var lines = child.stdout.str.split('\n');
child = null;
var ps, psx, v, vs = 0;
for(var x in lines)
{