AsgardEternal/SquadJS
1
0
Fork 0
mirror of https://github.com/AsgardEternal/SquadJS.git synced 2024-09-28 17:34:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix log parser stopping line processing

Browse Source
This commit is contained in:
Thomas Smyth 2020-10-14 16:50:13 +01:00
parent 238df419eb
commit 1858a6d888
1 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
log-parser/index.js
View File

@ -14,16 +14,23 @@ export default class LogParser extends EventEmitter {
this.eventStore = {};
this.queueLine = this.queueLine.bind(this);
this.handleLine = this.handleLine.bind(this);
this.queue = async.queue(this.handleLine);
this.queue = async.queue(async (line) => {
for (const rule of rules) {
const match = line.match(rule.regex);
if (!match) continue;
match[1] = moment.utc(match[1], 'YYYY.MM.DD-hh.mm.ss:SSS').toDate();
match[2] = parseInt(match[2]);
rule.onMatch(match, this);
break;
}
});
switch (options.mode || 'tail') {
case 'tail':
this.logReader = new TailLogReader(this.queueLine, options);
this.logReader = new TailLogReader(this.queue.push, options);
break;
case 'ftp':
this.logReader = new FTPLogReader(this.queueLine, options);
this.logReader = new FTPLogReader(this.queue.push, options);
break;
default:
throw new Error('Invalid mode.');
@ -37,20 +44,4 @@ export default class LogParser extends EventEmitter {
async unwatch() {
await this.logReader.unwatch();
}
queueLine(line) {
this.queue.push(line);
}
handleLine(line) {
for (const rule of rules) {
const match = line.match(rule.regex);
if (!match) continue;
match[1] = moment.utc(match[1], 'YYYY.MM.DD-hh.mm.ss:SSS').toDate();
match[2] = parseInt(match[2]);
rule.onMatch(match, this);
break;
}
}
}