jenkins-bot has submitted this change and it was merged.
Change subject: Improve default logger error formatting
......................................................................
Improve default logger error formatting
Use the more conventional 'location: message \n stack' format rather than
'message\nlocation\nstack'.
Also add special support for tracing with indentation based on the number of
slashes in the logType.
Change-Id: Ic7d0b6179f892d78721243e003a2fa228fdbae88
---
M lib/Logger.js
1 file changed, 25 insertions(+), 5 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/Logger.js b/lib/Logger.js
index a31ff83..9f13fdc 100644
--- a/lib/Logger.js
+++ b/lib/Logger.js
@@ -127,14 +127,34 @@
Logger.prototype._defaultBackend = function(logData, cb) {
try {
var logType = logData.logType;
- var msg = logData.msg();
- if (/^(error|warning)(\/|$)/.test(logType)) {
- msg += "\n" + logData.locationMsg();
+ var msg = '';
+ if (/^trace(?:\/|$)/.test(logType)) {
+ // indent by number of slashes
+ var level = logType.match(/\//g).length - 1;
+ msg += ' '.repeat(level);
+
+ // XXX: could shorten or strip trace/ logType prefix in
a pure
+ // trace logger
+ msg += logType;
+ // Fixed-width type column so that the messages align
+ var typeColumnWidth = 30;
+ msg = msg.substr(0, typeColumnWidth);
+ msg += ' '.repeat(typeColumnWidth - msg.length);
+ msg += ': ' + logData.msg();
+ } else if (/^(?:warning|error|fatal)(?:\/|$)/.test(logType)) {
+ msg = logData.locationMsg() + ': ' + logData.msg();
+ } else {
+ // not sure if this makes sense for perf events or the
like
+ msg = logData.msg();
}
+
if (/(^(error|fatal)|(^|\/)stacktrace)(\/|$)/.test(logType)) {
- msg += "\n" + logData.stack();
+ msg += '\n' + logData.stack();
}
- console.warn(msg);
+
+ if (msg) {
+ console.warn(msg);
+ }
} catch (e) {
console.error("Error in defaultBackend: " + e);
return;
--
To view, visit https://gerrit.wikimedia.org/r/119441
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic7d0b6179f892d78721243e003a2fa228fdbae88
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: GWicke <[email protected]>
Gerrit-Reviewer: Arlolra <[email protected]>
Gerrit-Reviewer: GWicke <[email protected]>
Gerrit-Reviewer: Mariapacana <[email protected]>
Gerrit-Reviewer: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
