jenkins-bot has submitted this change and it was merged.
Change subject: Wait until response is finished before exiting
......................................................................
Wait until response is finished before exiting
Change-Id: I74f5636aba06e1fde10ede2764f2cfc9f6c7a8fa
---
M api/ParsoidService.js
1 file changed, 9 insertions(+), 6 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/api/ParsoidService.js b/api/ParsoidService.js
index 79bc702..349bb60 100644
--- a/api/ParsoidService.js
+++ b/api/ParsoidService.js
@@ -388,8 +388,13 @@
return next( err );
}
- res.setHeader( 'Content-Type', 'text/plain; charset=UTF-8' );
- res.send( err.stack, err.code );
+ if ( err.restart ) {
+ // Force a clean restart of this worker
+ // after response is sent
+ res.on('finish', function () {
+ process.exit( 1 );
+ });
+ }
var location = 'ERROR in ' + res.local('iwp') + ':' +
res.local('pageName');
if ( req.query && req.query.oldid ) {
@@ -399,10 +404,8 @@
console.error( location );
console.error( 'Stack trace: ' + err.stack );
- if ( err.restart ) {
- // Force a clean restart of this worker
- process.exit( 1 );
- }
+ res.setHeader( 'Content-Type', 'text/plain; charset=UTF-8' );
+ res.send( err.stack, err.code );
}
app.use( errorHandler );
--
To view, visit https://gerrit.wikimedia.org/r/112068
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I74f5636aba06e1fde10ede2764f2cfc9f6c7a8fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: 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