Mobrovac has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/326450 )
Change subject: Update change-propagation to b2bf30d
......................................................................
Update change-propagation to b2bf30d
List of changes:
fdf1267 Use delivery callback to guarantee delivery
3717c06 Use 'connect' callback to figure out we're connected. Better then ready
event
639eb6f Don't fail if the resolver is not found for delivery report
ad6d4b9 Actually set up the logger
9e940c4 Got rid of the function keyword
cf9a705 Use shared kafka management tools
b40f5ed Don't clean in travis
373b9e5 Run scripts after npm install
615b2aa Better sourcing the file
875151a Better sourcing the file
2cbaa03 Better check for travis environment
3f525cb Correctly kill kafka afterwards
f95bf71 Improved cleanup script soursing
35f7b9a Improved CPU usage
b2bf30d Release v0.6.3
xxxxxxx Update node module dependencies
Change-Id: I36feac017264f55617d9ab7fc79f2ef317c9660a
---
M node_modules/hyperswitch/node_modules/json-stable-stringify/package.json
M node_modules/hyperswitch/node_modules/swagger-ui/package.json
M node_modules/service-runner/lib/logger.js
M
node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
M
node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/inherits/package.json
M node_modules/service-runner/package.json
M src
7 files changed, 38 insertions(+), 21 deletions(-)
Approvals:
Mobrovac: Verified; Looks good to me, approved
diff --git
a/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json
b/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json
index ec70b27..1f0d6c1 100644
--- a/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json
+++ b/node_modules/hyperswitch/node_modules/json-stable-stringify/package.json
@@ -50,7 +50,7 @@
"url": "https://github.com/substack/json-stable-stringify/issues";
},
"_id": "[email protected]",
- "_shasum": "7eb533f8b08fa8eafeabec67a181d276848bcbc0",
+ "_shasum": "87057c67bb058b9f428c3aed1d02000d41c24bf9",
"_from": "git+https://github.com/wikimedia/json-stable-stringify.git#master";,
"_resolved":
"git+https://github.com/wikimedia/json-stable-stringify.git#c05178e4dfc3834017f017732934c1c52ba3dd8f";
}
diff --git a/node_modules/hyperswitch/node_modules/swagger-ui/package.json
b/node_modules/hyperswitch/node_modules/swagger-ui/package.json
index 11b4990..441812d 100644
--- a/node_modules/hyperswitch/node_modules/swagger-ui/package.json
+++ b/node_modules/hyperswitch/node_modules/swagger-ui/package.json
@@ -73,7 +73,7 @@
"url": "https://github.com/swagger-api/swagger-ui/issues";
},
"_id": "[email protected]",
- "_shasum": "4038dde76a13ac26427a4a9cac3d1ba3fc23ea81",
+ "_shasum": "3ed9ef2d2f14e2c8ad58a317b4fb86ff1e974c62",
"_from": "git+https://github.com/wikimedia/swagger-ui.git#master";,
"_resolved":
"git+https://github.com/wikimedia/swagger-ui.git#b9b40dc8e00caeb24c19fe636b93250a7e335541";
}
diff --git a/node_modules/service-runner/lib/logger.js
b/node_modules/service-runner/lib/logger.js
index 814af94..486a3ca 100644
--- a/node_modules/service-runner/lib/logger.js
+++ b/node_modules/service-runner/lib/logger.js
@@ -296,27 +296,43 @@
}
};
-Logger.prototype.log = function(level, info) {
+/**
+ * Logs and info object with a specified level
+ * @param {string} level Log level and components, for example 'trace/request'
+ * @param {Object|Function} info log statement object, or a callback to lazily
construct
+ * the log statement after we've decided that
this particular
+ * level will be matched.
+ * @param {boolean} [force] optional argument to force sampled component
logging even
+ * if the probability wasn't met. Used together with
`isLoggable`
+ */
+Logger.prototype.log = function(level, info, force) {
var simpleLevel;
if (!level || !info) {
return;
}
+ function getLog(info) {
+ if (typeof info === "function") {
+ return info();
+ }
+ return info;
+ }
+
if (Logger.logTrace) {
simpleLevel = extractSimpleLevel(level);
if (simpleLevel) {
- this._log(info, simpleLevel, level, this._traceLogger);
+ this._log(getLog(info), simpleLevel, level, this._traceLogger);
}
return;
}
simpleLevel = this._getSimpleLogLevel(level);
if (simpleLevel) {
- this._log(info, simpleLevel, level, this._logger);
+ this._log(getLog(info), simpleLevel, level, this._logger);
} else {
- var componentLoggerConf = this._getComponentLogConfig(level);
+ var componentLoggerConf = this._getComponentLogConfig(level, force);
if (componentLoggerConf) {
- this._log(info, componentLoggerConf.level, level,
componentLoggerConf.logger);
+ this._log(getLog(info), componentLoggerConf.level, level,
componentLoggerConf.logger);
}
}
};
diff --git
a/node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
b/node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
index 8f42b69..78269fe 100644
---
a/node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
+++
b/node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
@@ -75,7 +75,7 @@
},
"homepage": "https://github.com/kadtools/kad#readme";,
"_id": "[email protected]",
- "_shasum": "0fe8af24c30eaeed113ff8230ac498797036b424",
+ "_shasum": "3e38e95f73e1bf7ad279f3fac3a6956137d63fdc",
"_from": "git+https://github.com/gwicke/kad.git#master";,
"_resolved":
"git+https://github.com/gwicke/kad.git#f35971036f43814043245da82b12d035b7bbfd16";
}
diff --git
a/node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/inherits/package.json
b/node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/inherits/package.json
index f0e62d3..9146e75 100644
---
a/node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/inherits/package.json
+++
b/node_modules/service-runner/node_modules/limitation/node_modules/readable-stream/node_modules/inherits/package.json
@@ -58,5 +58,6 @@
"tmp": "tmp/inherits-2.0.3.tgz_1473295776489_0.08142363070510328"
},
"directories": {},
- "_resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
+ "_resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";,
+ "readme": "ERROR: No README data found!"
}
diff --git a/node_modules/service-runner/package.json
b/node_modules/service-runner/package.json
index f8513e0..7ab69ca 100644
--- a/node_modules/service-runner/package.json
+++ b/node_modules/service-runner/package.json
@@ -1,6 +1,6 @@
{
"name": "service-runner",
- "version": "2.1.12",
+ "version": "2.1.13",
"description": "Generic nodejs service supervisor / cluster runner",
"main": "service-runner.js",
"bin": {
@@ -48,19 +48,19 @@
"mocha-jscs": "^5.0.1",
"bunyan-prettystream":
"git+https://github.com/hadfieldn/node-bunyan-prettystream.git#master";
},
- "gitHead": "2de01b2a4f596ccf981e1878d4f2778c087000cc",
- "_id": "[email protected]",
- "_shasum": "e1848d2168287e76a09386929181510a26c1ae46",
- "_from": "service-runner@>=2.1.7 <3.0.0",
+ "gitHead": "9e0385bfc47357f3d5626ca1bf4aa5cf85bbc1ff",
+ "_id": "[email protected]",
+ "_shasum": "e8ff78b93230d7d831ea3ed5587aa2292b829ceb",
+ "_from": "service-runner@>=2.1.13 <3.0.0",
"_npmVersion": "2.15.9",
"_nodeVersion": "4.6.0",
"_npmUser": {
- "name": "pchelolo",
- "email": "[email protected]"
+ "name": "doorman",
+ "email": "[email protected]"
},
"dist": {
- "shasum": "e1848d2168287e76a09386929181510a26c1ae46",
- "tarball":
"https://registry.npmjs.org/service-runner/-/service-runner-2.1.12.tgz";
+ "shasum": "e8ff78b93230d7d831ea3ed5587aa2292b829ceb",
+ "tarball":
"https://registry.npmjs.org/service-runner/-/service-runner-2.1.13.tgz";
},
"maintainers": [
{
@@ -78,8 +78,8 @@
],
"_npmOperationalInternal": {
"host": "packages-12-west.internal.npmjs.com",
- "tmp": "tmp/service-runner-2.1.12.tgz_1481155955250_0.02276564808562398"
+ "tmp": "tmp/service-runner-2.1.13.tgz_1481454485102_0.4104759928304702"
},
"directories": {},
- "_resolved":
"https://registry.npmjs.org/service-runner/-/service-runner-2.1.12.tgz";
+ "_resolved":
"https://registry.npmjs.org/service-runner/-/service-runner-2.1.13.tgz";
}
diff --git a/src b/src
index 28054b5..b2bf30d 160000
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit 28054b56aef92ab34e134ddfc47b852f92199523
+Subproject commit b2bf30d1504a7e24dca052e66d7ecc5b7479b781
--
To view, visit https://gerrit.wikimedia.org/r/326450
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I36feac017264f55617d9ab7fc79f2ef317c9660a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/change-propagation/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac <[email protected]>
Gerrit-Reviewer: Mobrovac <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
