Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/305754
Change subject: T141370: Use service-runner's logger as a backend to Parsoid's
logger
......................................................................
T141370: Use service-runner's logger as a backend to Parsoid's logger
Change-Id: I46643bf6dfca523a327b13155a518753e4493a08
---
M lib/index.js
1 file changed, 13 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/54/305754/1
diff --git a/lib/index.js b/lib/index.js
index 8dc828f..5bf3fb4 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -7,6 +7,9 @@
var ParsoidConfig = require('./config/ParsoidConfig.js').ParsoidConfig;
var ParsoidService = require('./api/ParsoidService.js');
var JsApi = require('./jsapi.js');
+var BunyanLogger = require('./logger/Logger.bunyan.js').BunyanLogger;
+
+var prepareLog = BunyanLogger.prototype._createBunyanLog;
/**
* Main entry point for Parsoid's JavaScript API.
@@ -156,6 +159,15 @@
if (options.config.localsettings) {
localSettings = require(path.resolve(options.appBasePath,
options.config.localsettings));
}
- var parsoidConfig = new ParsoidConfig(localSettings, options.config);
+ // By default, set the loggerBackend to service-runner's logger.
+ var parsoidOptions = {
+ loggerBackend: function(logData, cb) {
+ options.logger.log(logData.logType,
prepareLog(logData));
+ cb();
+ },
+ };
+ // but it can be overriden here.
+ Object.assign(parsoidOptions, options.config);
+ var parsoidConfig = new ParsoidConfig(localSettings, parsoidOptions);
return ParsoidService.init(parsoidConfig, options.logger);
};
--
To view, visit https://gerrit.wikimedia.org/r/305754
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I46643bf6dfca523a327b13155a518753e4493a08
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra <abrea...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
