Showing
5 changed files
with
13 additions
and
9 deletions
@@ -17,18 +17,19 @@ function parseMessage(line) { | @@ -17,18 +17,19 @@ function parseMessage(line) { | ||
17 | 17 | ||
18 | let [tags, fields, time] = [qs.parse(tokens[0], ',', '='), qs.parse(tokens[1], ',', '='), tokens[2]]; | 18 | let [tags, fields, time] = [qs.parse(tokens[0], ',', '='), qs.parse(tokens[1], ',', '='), tokens[2]]; |
19 | 19 | ||
20 | + // 服务器路由 | ||
20 | if (tags.path) { | 21 | if (tags.path) { |
21 | let [, p] = tags.path.split(']'); | 22 | let [, p] = tags.path.split(']'); |
22 | 23 | ||
23 | p = routeDecode(p) || 'null'; | 24 | p = routeDecode(p) || 'null'; |
24 | tags.path = p; | 25 | tags.path = p; |
25 | - tags.route = tags.path; | ||
26 | } | 26 | } |
27 | 27 | ||
28 | if (fields.uid && fields.uid === '"undefined"') { | 28 | if (fields.uid && fields.uid === '"undefined"') { |
29 | fields.uid = '0'; | 29 | fields.uid = '0'; |
30 | } | 30 | } |
31 | 31 | ||
32 | + // 具体请求路径 | ||
32 | if (!tags.route) { | 33 | if (!tags.route) { |
33 | tags.route = 'null'; | 34 | tags.route = 'null'; |
34 | } | 35 | } |
@@ -71,7 +71,7 @@ function handleClientError(scope, item) { | @@ -71,7 +71,7 @@ function handleClientError(scope, item) { | ||
71 | const ipInfo = ipService.getIsp(scope.ip); | 71 | const ipInfo = ipService.getIsp(scope.ip); |
72 | const row = Object.assign(msg2row.errorRouter(data), ipInfo, {ip: scope.ip}); | 72 | const row = Object.assign(msg2row.errorRouter(data), ipInfo, {ip: scope.ip}); |
73 | 73 | ||
74 | - logger.debug('[client] error info [%s]', JSON.stringify(row)); | 74 | + logger.info('[client] error info [%s]', JSON.stringify(row)); |
75 | errorRouterSqlSender.addMessage(row); | 75 | errorRouterSqlSender.addMessage(row); |
76 | } | 76 | } |
77 | 77 | ||
@@ -124,7 +124,7 @@ function handleClientFirst(scope, item) { | @@ -124,7 +124,7 @@ function handleClientFirst(scope, item) { | ||
124 | } | 124 | } |
125 | }); | 125 | }); |
126 | 126 | ||
127 | - logger.debug('[client] slow route info [%s]', JSON.stringify(data)); | 127 | + logger.info('[client] slow route info [%s]', JSON.stringify(data)); |
128 | 128 | ||
129 | if (duration > config.slowRoute.min && duration < config.slowRoute.max) { | 129 | if (duration > config.slowRoute.min && duration < config.slowRoute.max) { |
130 | slowRouterSqlSender.addMessage(msg2row.slowRouter(data)); | 130 | slowRouterSqlSender.addMessage(msg2row.slowRouter(data)); |
@@ -166,7 +166,7 @@ async function handleClientTiming(scope, item) { | @@ -166,7 +166,7 @@ async function handleClientTiming(scope, item) { | ||
166 | 166 | ||
167 | _.merge(data, ipInfo); | 167 | _.merge(data, ipInfo); |
168 | 168 | ||
169 | - logger.debug('[client] perf info [%s]', JSON.stringify(data)); | 169 | + logger.info('[client] perf info [%s]', JSON.stringify(data)); |
170 | 170 | ||
171 | perfReportSqlSender.addMessage(data); | 171 | perfReportSqlSender.addMessage(data); |
172 | } | 172 | } |
@@ -32,7 +32,8 @@ function errorRouter(m) { | @@ -32,7 +32,8 @@ function errorRouter(m) { | ||
32 | reqid: _.get(m, 'fields.reqID', '').replace(/"/g, ''), | 32 | reqid: _.get(m, 'fields.reqID', '').replace(/"/g, ''), |
33 | uid: _.parseInt(uid), | 33 | uid: _.parseInt(uid), |
34 | udid: _.get(m, 'fields.udid', '').replace(/"/g, ''), | 34 | udid: _.get(m, 'fields.udid', '').replace(/"/g, ''), |
35 | - route: _.get(m, 'tags.route', ''), | 35 | + route: _.get(m, 'tags.path', ''), |
36 | + url: _.get(m.get('tags.route'), ''), | ||
36 | code: _.parseInt(_.get(m, 'tags.code', '0')), | 37 | code: _.parseInt(_.get(m, 'tags.code', '0')), |
37 | line: _.parseInt(line), | 38 | line: _.parseInt(line), |
38 | column: _.parseInt(column), | 39 | column: _.parseInt(column), |
@@ -33,7 +33,7 @@ function handleWebServerDuration(m) { | @@ -33,7 +33,7 @@ function handleWebServerDuration(m) { | ||
33 | return; | 33 | return; |
34 | } | 34 | } |
35 | 35 | ||
36 | - logger.debug('[api] info [%s]', JSON.stringify(m)); | 36 | + logger.debug('[api] route info [%s]', JSON.stringify(m)); |
37 | 37 | ||
38 | apiInfluxSender.addMessage({ | 38 | apiInfluxSender.addMessage({ |
39 | tags: { | 39 | tags: { |
@@ -92,16 +92,16 @@ function handleErrorReport(m) { | @@ -92,16 +92,16 @@ function handleErrorReport(m) { | ||
92 | const type = _.get(m, 'tags.type', ''); | 92 | const type = _.get(m, 'tags.type', ''); |
93 | 93 | ||
94 | if (type === 'api') { | 94 | if (type === 'api') { |
95 | - logger.debug('[api] error info [%s]', JSON.stringify(m)); | 95 | + logger.info('[api] error info [%s]', JSON.stringify(m)); |
96 | } else { | 96 | } else { |
97 | - logger.debug('[server] error info [%s]', JSON.stringify(m)); | 97 | + logger.info('[server] error info [%s]', JSON.stringify(m)); |
98 | } | 98 | } |
99 | 99 | ||
100 | errorSqlSender.addMessage(msg2row.errorRouter(m)); | 100 | errorSqlSender.addMessage(msg2row.errorRouter(m)); |
101 | } | 101 | } |
102 | 102 | ||
103 | function handleProcessInfo(m) { | 103 | function handleProcessInfo(m) { |
104 | - logger.debug('[process] info [%s]', JSON.stringify(m)); | 104 | + logger.info('[process] info [%s]', JSON.stringify(m)); |
105 | 105 | ||
106 | m.measurement = 'process-info'; | 106 | m.measurement = 'process-info'; |
107 | 107 |
@@ -19,3 +19,5 @@ ALTER TABLE error_report ADD country varchar(100); | @@ -19,3 +19,5 @@ ALTER TABLE error_report ADD country varchar(100); | ||
19 | ALTER TABLE error_report ADD region varchar(100); | 19 | ALTER TABLE error_report ADD region varchar(100); |
20 | ALTER TABLE error_report ADD city varchar(100); | 20 | ALTER TABLE error_report ADD city varchar(100); |
21 | ALTER TABLE error_report ADD isp varchar(100); | 21 | ALTER TABLE error_report ADD isp varchar(100); |
22 | + | ||
23 | +ALTER TABLE error_report ADD url varchar(200); |
-
Please register or login to post a comment