public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PadMessageHandler: Improve error logging 

Use a log4js logger instead of `console`, and clean up some of the log
messages.
pull/5285/head
Richard Hansen 2021-11-16 16:01:01 -05:00
parent 1447ab8899
commit e961718ff2
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/node/handler/PadMessageHandler.js
View File

@ -202,8 +202,8 @@ exports.handleMessage = async (socket, message) => {
try { try {
await rateLimiter.consume(socket.request.ip); // consume 1 point per event from IP await rateLimiter.consume(socket.request.ip); // consume 1 point per event from IP
} catch (e) { } catch (e) {
console.warn(`Rate limited: ${socket.request.ip} to reduce the amount of rate limiting ` + messageLogger.warn(`Rate limited IP ${socket.request.ip}. To reduce the amount of rate ` +
'that happens edit the rateLimit values in settings.json'); 'limiting that happens edit the rateLimit values in settings.json');
stats.meter('rateLimited').mark(); stats.meter('rateLimited').mark();
socket.json.send({disconnect: 'rateLimited'}); socket.json.send({disconnect: 'rateLimited'});
return; return;
@ -584,7 +584,7 @@ const handleUserChanges = async (socket, message) => {
// and always use the copy. atm a message will be ignored if the session is gone even // and always use the copy. atm a message will be ignored if the session is gone even
// if the session was valid when the message arrived in the first place // if the session was valid when the message arrived in the first place
if (!thisSession) { if (!thisSession) {
messageLogger.warn('Dropped message, disconnect happened in the mean time'); messageLogger.warn('Ignoring USER_CHANGES from disconnected user');
return; return;
} }
@ -693,7 +693,7 @@ const handleUserChanges = async (socket, message) => {
} catch (err) { } catch (err) {
socket.json.send({disconnect: 'badChangeset'}); socket.json.send({disconnect: 'badChangeset'});
stats.meter('failedChangesets').mark(); stats.meter('failedChangesets').mark();
console.warn(`Failed to apply USER_CHANGES from author ${thisSession.author} ` + messageLogger.warn(`Failed to apply USER_CHANGES from author ${thisSession.author} ` +
`(socket ${socket.id}) on pad ${thisSession.padId}: ${err.stack || err}`); `(socket ${socket.id}) on pad ${thisSession.padId}: ${err.stack || err}`);
} }
@ -969,7 +969,7 @@ const handleClientReady = async (socket, message) => {
apool = attribsForWire.pool.toJsonable(); apool = attribsForWire.pool.toJsonable();
atext.attribs = attribsForWire.translated; atext.attribs = attribsForWire.translated;
} catch (e) { } catch (e) {
console.error(e.stack || e); messageLogger.error(e.stack || e);
socket.json.send({disconnect: 'corruptPad'}); // pull the brakes socket.json.send({disconnect: 'corruptPad'}); // pull the brakes
return; return;
@ -1172,8 +1172,8 @@ const handleChangesetRequest = async (socket, message) => {
data.requestID = message.data.requestID; data.requestID = message.data.requestID;
socket.json.send({type: 'CHANGESET_REQ', data}); socket.json.send({type: 'CHANGESET_REQ', data});
} catch (err) { } catch (err) {
console.error(`Error while handling a changeset request for ${padIds.padId}`, messageLogger.error(`Error while handling a changeset request ${message.data} ` +
err.toString(), message.data); `for ${padIds.padId}: ${err.stack || err}`);
} }
}; };
@ -1316,7 +1316,8 @@ const composePadChangesets = async (padId, startNum, endNum) => {
return changeset; return changeset;
} catch (e) { } catch (e) {
// r-1 indicates the rev that was build starting with startNum, applying startNum+1, +2, +3 // r-1 indicates the rev that was build starting with startNum, applying startNum+1, +2, +3
console.warn('failed to compose cs in pad:', padId, ' startrev:', startNum, ' current rev:', r); messageLogger.warn(
`failed to compose cs in pad: ${padId} startrev: ${startNum} current rev: ${r}`);
throw e; throw e;
} }
}; };