jenkins-bot has submitted this change and it was merged.
Change subject: linter: Send logs through main logger instead of to the console
......................................................................
linter: Send logs through main logger instead of to the console
This allows us to send the linter logs through the main logging system,
so we can esitmate how many existing lint issues there are before
activating the linter API.
Change-Id: Ib3d6d445292d114240261b3a352acf63efc6d7cd
---
M lib/config/MWParserEnvironment.js
M lib/index.js
M lib/logger/linter.js
3 files changed, 16 insertions(+), 10 deletions(-)
Approvals:
Arlolra: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/config/MWParserEnvironment.js
b/lib/config/MWParserEnvironment.js
index 234a288..d25f2e7 100644
--- a/lib/config/MWParserEnvironment.js
+++ b/lib/config/MWParserEnvironment.js
@@ -255,10 +255,16 @@
var logger = new ParsoidLogger(this);
this.setLogger(logger);
- // Configure backends
- logger.registerLoggingBackends([
+ var defaultLogLevels = [
"fatal", "error", "warning", "info",
- ], this.conf.parsoid, this.linter);
+ ];
+
+ if (this.conf.parsoid.linting && !this.conf.parsoid.linterAPI) {
+ defaultLogLevels.push("lint");
+ }
+
+ // Configure backends
+ logger.registerLoggingBackends(defaultLogLevels, this.conf.parsoid,
this.linter);
};
// The default page name (true name, without wikitext url encoding)
diff --git a/lib/index.js b/lib/index.js
index 79495c8..0850b6b 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -175,6 +175,7 @@
var parsoidOptions = {
loggerBackend: function(logData, cb) {
var type = logData.logType.replace(/^warning/, 'warn');
+ type = type.replace(/^lint/, 'info/lint');
options.logger.log(type, prepareLog(logData));
cb();
},
diff --git a/lib/logger/linter.js b/lib/logger/linter.js
index 81ecf51..c2ab554 100644
--- a/lib/logger/linter.js
+++ b/lib/logger/linter.js
@@ -15,19 +15,18 @@
};
Linter.prototype.logLintOutput = function(logData, cb) {
+ var env = this._env;
try {
- if (!this._env.conf.parsoid.linterAPI) {
- console.log(this.buffer);
- } else {
+ if (env.conf.parsoid.linterAPI) {
// Only send the request if it is
// the latest revision
- if (this._env.page.meta.revision.revid ===
this._env.page.latest) {
+ if (env.page.meta.revision.revid === env.page.latest) {
request.post(
- this._env.conf.parsoid.linterAPI,
+ env.conf.parsoid.linterAPI,
{ form: {
data:
JSON.stringify(this.buffer),
- page: this._env.page.name,
- revision:
this._env.page.meta.revision.revid,
+ page: env.page.name,
+ revision:
env.page.meta.revision.revid,
action: 'record-lint',
format: 'json',
formatversion: 2,
--
To view, visit https://gerrit.wikimedia.org/r/316210
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3d6d445292d114240261b3a352acf63efc6d7cd
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Arlolra <abrea...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
