jenkins-bot has submitted this change and it was merged.
Change subject: Improve error reporting
......................................................................
Improve error reporting
Improve the web api errCB printing to the log and make sure it is also called
for errors in the DOMPostProcessor.
Change-Id: I6af30a54e5cac3fe5dca29486168828982348683
---
M js/api/ParserService.js
M js/lib/mediawiki.TokenTransformManager.js
M js/lib/mediawiki.parser.environment.js
3 files changed, 9 insertions(+), 7 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/js/api/ParserService.js b/js/api/ParserService.js
index a385663..bc0d2e2 100644
--- a/js/api/ParserService.js
+++ b/js/api/ParserService.js
@@ -366,7 +366,8 @@
env.errCB = function ( e ) {
var errmsg = e.stack || e.toString();
var code = e.code || 500;
- console.error( errmsg );
+ console.error( 'ERROR in ' + pageName + ':\n' +
e.message);
+ console.error("Stack trace: " + errmsg);
res.send( errmsg, code );
// Force a clean restart of this worker
process.exit(1);
@@ -644,10 +645,6 @@
return;
}
- env.errCB = function ( e ) {
- console.error( e.stack );
- res.send( e.stack, 500 );
- };
try {
// FIXME: Fetch oldid source and pass it in.
diff --git a/js/lib/mediawiki.TokenTransformManager.js
b/js/lib/mediawiki.TokenTransformManager.js
index 9f0f0cc..cea772a 100644
--- a/js/lib/mediawiki.TokenTransformManager.js
+++ b/js/lib/mediawiki.TokenTransformManager.js
@@ -963,7 +963,12 @@
// This phase is fully synchronous, so just pass the end along and
prepare
// for the next round.
this.prevToken = null;
- this.emit('end');
+ try {
+ this.emit('end');
+ } catch (e) {
+ // Properly handle DOMPostProcessor etc exceptions
+ this.env.errCB(e);
+ }
};
diff --git a/js/lib/mediawiki.parser.environment.js
b/js/lib/mediawiki.parser.environment.js
index ccfbbdf..52864f4 100644
--- a/js/lib/mediawiki.parser.environment.js
+++ b/js/lib/mediawiki.parser.environment.js
@@ -492,7 +492,7 @@
*/
MWParserEnvironment.prototype.errCB = function ( error ) {
console.log( 'ERROR in ' + this.page.name + ':\n' + error.message);
- console.log("stack trace: " + error.stack);
+ console.log("Stack trace: " + error.stack);
process.exit( 1 );
};
--
To view, visit https://gerrit.wikimedia.org/r/68827
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6af30a54e5cac3fe5dca29486168828982348683
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: GWicke <[email protected]>
Gerrit-Reviewer: GWicke <[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
