Cscott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214485
Change subject: Be more careful about which MW API warnings we suppress.
......................................................................
Be more careful about which MW API warnings we suppress.
Change-Id: Ibe3fb82ae81c87ce8ee598368106c5ec79fca394
---
M lib/mediawiki.ApiRequest.js
M lib/mediawiki.ParsoidConfig.js
2 files changed, 15 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/85/214485/1
diff --git a/lib/mediawiki.ApiRequest.js b/lib/mediawiki.ApiRequest.js
index 4d01ad7..7706864 100644
--- a/lib/mediawiki.ApiRequest.js
+++ b/lib/mediawiki.ApiRequest.js
@@ -25,7 +25,15 @@
var logAPIWarnings = function(request, data) {
if (request.env.conf.parsoid.logMwApiWarnings &&
data && data.hasOwnProperty('warnings')) {
- request.env.log('warning/api', request.reqType, data.warnings);
+ // split up warnings by API module
+ Object.keys(data.warnings).forEach(function(apiModule) {
+ var re = request.env.conf.parsoid.suppressMwApiWarnings;
+ var msg = data.warnings[apiModule]['*'];
+ if (re instanceof RegExp && re.test(msg)) {
+ return; // suppress this message
+ }
+ request.env.log('warning/api', request.reqType,
apiModule, msg);
+ });
}
};
diff --git a/lib/mediawiki.ParsoidConfig.js b/lib/mediawiki.ParsoidConfig.js
index 8aa98dd..451e167 100644
--- a/lib/mediawiki.ParsoidConfig.js
+++ b/lib/mediawiki.ParsoidConfig.js
@@ -288,7 +288,12 @@
/**
* Log warnings from the Mediawiki Api.
*/
-ParsoidConfig.prototype.logMwApiWarnings = false;
+ParsoidConfig.prototype.logMwApiWarnings = true;
+
+/**
+ * Suppress some warnings by default.
+ */
+ParsoidConfig.prototype.suppressMwApiWarnings = /modulemessages is deprecated/;
/**
* @property {number} How often should we emit a heap sample? Time in ms.
--
To view, visit https://gerrit.wikimedia.org/r/214485
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe3fb82ae81c87ce8ee598368106c5ec79fca394
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Cscott <canan...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
