MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2024-12-25 14:45:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed agent log parsing bug

Browse Source
This commit is contained in:
Bryan Roe 2021-04-22 15:00:54 -07:00
parent 8674f8eb02
commit a5053b17e5
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
agents/modules_meshcore/util-agentlog.js
View File

@ -109,10 +109,24 @@ function parseLine(entry)
function readLog_data(buffer) function readLog_data(buffer)
{ {
var lines = buffer.toString().split('\n'); var lines = buffer.toString();
while(lines.length > 0) if (this.buffered != null) { lines = this.buffered + lines; }
lines = lines.split('\n');
var i;
for (i = 0; i < (lines.length - 1) ; ++i)
{ {
parseLine.call(this, lines.shift()); parseLine.call(this, lines[i]);
}
if (lines.length == 1)
{
parseLine.call(this, lines[0]);
this.buffered = null;
}
else
{
this.buffered = lines[lines.length - 1];
} }
} }
@ -122,9 +136,11 @@ function readLogEx(path)
try try
{ {
var s = require('fs').createReadStream(path); var s = require('fs').createReadStream(path);
s.buffered = null;
s.results = ret; s.results = ret;
s.on('data', readLog_data); s.on('data', readLog_data);
s.resume(); s.resume();
if (s.buffered != null) { readLog_data.call(s, s.buffered); s.buffered = null; }
s.removeAllListeners('data'); s.removeAllListeners('data');
s = null; s = null;
} }