fe / yoho-apm · Commits

Go to a project

Authored by htoooth
Commit ea3bdd1ffad04bed80799d0c24648a37412d1a53 1 parent 3e77d315

fix

Inline Side-by-side
Showing 2 changed files with 15 additions and 14 deletions
... ... @@ -21,8 +21,8 @@ const durationType = {
const routeInfluxSender = new Sender(config.reportRoute);
const slowRouterSender = new MysqlSender(config.table.slow);
const errorRouterSender = new MysqlSender(config.table.error);
const slowRouterSqlSender = new MysqlSender(config.table.slow);
const errorRouterSqlSender = new MysqlSender(config.table.error);
module.exports = (req, res, next) => {
if (!req.query.l) {
... ... @@ -46,6 +46,7 @@ module.exports = (req, res, next) => {
if (item.u) {
try {
item.u = decodeUid(item.u);
item.u = parseInt(item.u);
} catch (e) {
logger.error('decode uid error ', item.u);
item.u = '0';
... ... @@ -110,7 +111,7 @@ module.exports = (req, res, next) => {
}, fields)
});
errorRouterSender.addMessage(msg2row.errorRouter(data));
errorRouterSqlSender.addMessage(msg2row.errorRouter(data));
});
} else {
let data = {
... ... @@ -154,7 +155,7 @@ module.exports = (req, res, next) => {
});
if (duration > config.slowRoute.min && duration < config.slowRoute.max) {
slowRouterSender.addMessage(msg2row.slowRouter(data));
slowRouterSqlSender.addMessage(msg2row.slowRouter(data));
}
}
}
... ...
... ... @@ -4,11 +4,11 @@ const config = require('../common/config');
const msg2row = require('./msg2row');
const lineparse = require('../lib/line-parse');
const errorSender = new MysqlSender(config.table.error);
const slowRouterSender = new MysqlSender(config.table.slow);
const errorSqlSender = new MysqlSender(config.table.error);
const slowRouterSqlSender = new MysqlSender(config.table.slow);
const routeSender = new Sender(config.reportRoute);
const apiSender = new Sender(config.reportApi);
const routeInfluxSender = new Sender(config.reportRoute);
const apiInfluxSender = new Sender(config.reportApi);
const _ = require('lodash');
const server = {
... ... @@ -20,11 +20,11 @@ const server = {
let duration = parseInt(m.fields.duration);
if (duration > config.slowRoute.min && duration < config.slowRoute.max) {
slowRouterSender.addMessage(msg2row.slowRouter(m));
slowRouterSqlSender.addMessage(msg2row.slowRouter(m));
}
if (m.tags.type.toLowerCase() === 'api') {
apiSender.addMessage({
apiInfluxSender.addMessage({
tags: {
app: m.tags.app,
host: m.tags.hostname,
... ... @@ -38,7 +38,7 @@ const server = {
}
if (m.tags.type.toLowerCase() === 'route') {
routeSender.addMessage({
routeInfluxSender.addMessage({
tags: {
app: m.tags.app,
host: m.tags.hostname,
... ... @@ -50,7 +50,7 @@ const server = {
});
}
} else if (m.measurement === 'error-report') {
routeSender.addMessage({
routeInfluxSender.addMessage({
measurement: 'error-info',
tags: {
app: m.tags.app,
... ... @@ -63,12 +63,12 @@ const server = {
}
});
errorSender.addMessage(msg2row.errorRouter(m));
errorSqlSender.addMessage(msg2row.errorRouter(m));
} else if (m.measurement === 'process-info') {
m.measurement = 'process-info';
_.set(m, 'fields.memory', parseInt(_.get(m, 'fields.memory', '0')));
_.set(m, 'fields.cpu', parseInt(_.get(m, 'fields.cpu', '0')));
routeSender.addMessage(m);
routeInfluxSender.addMessage(m);
}
}
}
... ...