1
0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-11 05:43:33 +00:00

Fixed Agent-Log parsing bug

This commit is contained in:
Bryan Roe
2021-04-22 14:58:30 -07:00
parent f784374bb5
commit 569ce4a1e7
2 changed files with 25 additions and 4 deletions

View File

@@ -2262,7 +2262,7 @@ void ILibDuktape_Polyfills_JS_Init(duk_context *ctx)
duk_peval_string_noresult(ctx, "addCompressedModule('promise', Buffer.from('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', 'base64'));");
// util-agentlog, used to parse agent error logs. Refer to modules/util-agentlog.js
duk_peval_string_noresult(ctx, "addCompressedModule('util-agentlog', Buffer.from('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', 'base64'));");
duk_peval_string_noresult(ctx, "addCompressedModule('util-agentlog', Buffer.from('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', 'base64'));");
// util-pathHelper, used to settings/config by the agent. Refer to /modules/util-pathHelper for details.
duk_peval_string_noresult(ctx, "addCompressedModule('util-pathHelper', Buffer.from('eJy1VFFP2zAQfo+U/3DrA0lZSEu3J1A1dYVp0VA70bIKiRc3uaQeqe3ZDqFC++87N8kAMWli0vIQK77Pd9/33TmDQ9+bSrXTvNhYGA1HQ0iExRKmUiupmeVS+J7vXfAUhcEMKpGhBrtBmCiW0tJGIviG2hAaRvEQQgfotaFe/9T3drKCLduBkBYqg5SBG8h5iYD3KSoLXEAqt6rkTKQINbebfZU2R+x7120GubaMwIzgir7ypzBg1rEFejbWqpPBoK7rmO2ZxlIXg7LBmcFFMj2fLc6PiK07cSVKNAY0/qi4JpnrHTBFZFK2Joolq0FqYIVGilnpyNaaWy6KCIzMbc00+l7GjdV8XdlnPnXUSO9TADnFBPQmC0gWPfg4WSSLyPdWyfLz/GoJq8nl5WS2TM4XML+E6Xx2liyT+Yy+PsFkdg1fktlZBEguURW8V9qxJ4rcOYgZ2bVAfFY+lw0dozDlOU9JlCgqViAU8g61IC2gUG+5cV00RC7zvZJvud0PgXmpiIocDpx5eSVSh6H23OJXZjehotdxBG4ZRa7f09VZ3/cemtbwHMJmD96MQVRlCQcHjygHaZHuuWNUVd5SRRiD0jIlqXFaZ2E/NiTWht2eKpkllVsYjyGouXg3CuADBDc3AZxAMAjcGHZJm4Sxkir803ZlWg2vLdFkfJpyn4aYt6m/Sy5ezfhnN9TOub2psbFMW7OiAQiDOOi/tK2DHsdWXsga9ZQZJM9QZN0xvEc6CQ+/ObaSq7UbU1GEw6jdKlEUdCGP4H3/1LF5Lu5tc3L0yNYtWBr8SzP/xeHXN3H0H9rhFo220qJ12cX2bdrKrCqRvKXfp3Uqu0tx6qK+9wtCYKEt', 'base64'));");

View File

@@ -95,6 +95,11 @@ function parseLine(entry)
var log = { t: Math.floor(d / 1000), m: msg };
if (hash != null) { log.h = hash; }
if (log.t == 1610996025)
{
log.raw = entry;
}
// Check for File/Line in generic log entry
test = msg.match(/^.+:[0-9]+ \([0-9]+,[0-9]+\)/);
if (test != null)
@@ -109,10 +114,24 @@ function parseLine(entry)
function readLog_data(buffer)
{
var lines = buffer.toString().split('\n');
while(lines.length > 0)
var lines = buffer.toString();
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 +141,11 @@ function readLogEx(path)
try
{
var s = require('fs').createReadStream(path);
s.buffered = null;
s.results = ret;
s.on('data', readLog_data);
s.resume();
if (s.buffered != null) { readLog_data.call(s, s.buffered); s.buffered = null; }
s.removeAllListeners('data');
s = null;
}