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

Add additional logging to LogParser

Browse Source
This commit is contained in:
Thomas Smyth 2020-10-25 14:28:36 +00:00
parent 7262533f0e
commit 0d5bd481f0
5 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/logger.js
View File

@ -4,7 +4,8 @@ class Logger {
}
verbose(module, verboseness, message, ...extras) {
if((this.verboseness[module] || 1) >= verboseness) console.log(`[${module}][${verboseness}] ${message}`, ...extras);
if ((this.verboseness[module] || 1) >= verboseness)
console.log(`[${module}][${verboseness}] ${message}`, ...extras);
}
setVerboseness(module, verboseness) {

6
log-parser/index.js
View File

@ -20,13 +20,19 @@ export default class LogParser extends EventEmitter {
this.linesPerMinuteInterval = null;
this.queue = async.queue(async (line) => {
Logger.verbose('LogParser', 4, `Matching on line: ${line}`);
for (const rule of rules) {
const match = line.match(rule.regex);
if (!match) continue;
Logger.verbose('LogParser', 3, `Matched on line: ${match[0]}`);
match[1] = moment.utc(match[1], 'YYYY.MM.DD-hh.mm.ss:SSS').toDate();
match[2] = parseInt(match[2]);
rule.onMatch(match, this);
break;
}

24
squad-server/index.js
View File

@ -358,7 +358,7 @@ export default class SquadServer extends EventEmitter {
static async buildFromConfig(config) {
// Setup logging levels
for(const [module, verboseness] of Object.entries(config.verboseness)) {
for (const [module, verboseness] of Object.entries(config.verboseness)) {
Logger.setVerboseness(module, verboseness);
}
@ -399,7 +399,11 @@ export default class SquadServer extends EventEmitter {
Logger.verbose('SquadServer', 1, `Starting mysqlPool connector ${connectorName}...`);
connectors[connectorName] = mysql.createPool(connectorConfig);
} else if (option.connector === 'squadlayerpool') {
Logger.verbose('SquadServer', 1, `Starting squadlayerfilter connector ${connectorName}...`);
Logger.verbose(
'SquadServer',
1,
`Starting squadlayerfilter connector ${connectorName}...`
);
connectors[connectorName] = server.squadLayers[connectorConfig.type](
connectorConfig.filter,
connectorConfig.activeLayerFilter
@ -491,9 +495,19 @@ export default class SquadServer extends EventEmitter {
try {
const { data } = await axios.post(SQUADJS_API_DOMAIN + '/api/v1/ping', { config });
if(data.error) Logger.verbose('SquadServer', 1, `Successfully pinged the SquadJS API. Got back error: ${data.error}`);
else Logger.verbose('SquadServer', 1, `Successfully pinged the SquadJS API. Got back message: ${data.message}`);
} catch(err) {
if (data.error)
Logger.verbose(
'SquadServer',
1,
`Successfully pinged the SquadJS API. Got back error: ${data.error}`
);
else
Logger.verbose(
'SquadServer',
1,
`Successfully pinged the SquadJS API. Got back message: ${data.message}`
);
} catch (err) {
Logger.verbose('SquadServer', 1, 'Failed to ping the SquadJS API: ', err);
}

3
squad-server/utils/logger.js
View File

@ -4,7 +4,8 @@ class Logger {
}
verbose(module, verboseness, message, ...extras) {
if(this.verboseness[module] >= verboseness) console.log(`[${module}][${verboseness}] ${message}`, ...extras);
if (this.verboseness[module] >= verboseness)
console.log(`[${module}][${verboseness}] ${message}`, ...extras);
}
setVerboseness(module, verboseness) {