mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-23 13:05:12 +01:00
Code Issues Projects Releases Wiki Activity

Change streaming server error messages when failing to parse client input (#17559)

Browse Source 
Fixes #17541

- prefix JSON parsing error message by “Error parsing message from …”
- output user id if a user is logged in, IP address otherwise
- reduce log level from error to warning when a user is logged in, and to silly
  otherwise
This commit is contained in:
Claire 2022-02-16 14:37:26 +01:00 committed by GitHub
parent 8f537a1168
commit 6ea80ba2a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
streaming/index.js
View File

@ -92,13 +92,18 @@ const numWorkers = +process.env.STREAMING_CLUSTER_NUM || (env === 'development'
/** /**
* @param {string} json * @param {string} json
* @param {any} req
* @return {Object.<string, any>|null} * @return {Object.<string, any>|null}
*/ */
const parseJSON = (json) => { const parseJSON = (json, req) => {
try { try {
return JSON.parse(json); return JSON.parse(json);
} catch (err) { } catch (err) {
log.error(err); if (req.accountId) {
log.warn(req.requestId, `Error parsing message from user ${req.accountId}: ${err}`);
} else {
log.silly(req.requestId, `Error parsing message from ${req.remoteAddress}: ${err}`);
}
return null; return null;
} }
}; };
@ -450,7 +455,7 @@ const startWorker = async (workerId) => {
*/ */
const createSystemMessageListener = (req, eventHandlers) => { const createSystemMessageListener = (req, eventHandlers) => {
return message => { return message => {
const json = parseJSON(message); const json = parseJSON(message, req);
if (!json) return; if (!json) return;
@ -573,7 +578,7 @@ const startWorker = async (workerId) => {
log.verbose(req.requestId, `Starting stream from ${ids.join(', ')} for ${accountId}`); log.verbose(req.requestId, `Starting stream from ${ids.join(', ')} for ${accountId}`);
const listener = message => { const listener = message => {
const json = parseJSON(message); const json = parseJSON(message, req);
if (!json) return; if (!json) return;
@ -1037,7 +1042,7 @@ const startWorker = async (workerId) => {
ws.on('error', onEnd); ws.on('error', onEnd);
ws.on('message', data => { ws.on('message', data => {
const json = parseJSON(data); const json = parseJSON(data, session.request);
if (!json) return; if (!json) return;