GWicke has uploaded a new change for review. https://gerrit.wikimedia.org/r/271194
Change subject: Update restbase to 3ae3cca ...................................................................... Update restbase to 3ae3cca List of changes: xxxxxxx Update node module dependencies Change-Id: I5fcbdef0115708c1207b4d2c37c18558b9ad67f0 --- M node_modules/content-type/package.json M node_modules/hyperswitch/lib/server.js M node_modules/hyperswitch/node_modules/json-stable-stringify/package.json M node_modules/hyperswitch/node_modules/swagger-ui/package.json M node_modules/hyperswitch/package.json M node_modules/json-stable-stringify/package.json M node_modules/restbase-mod-table-cassandra/node_modules/json-stable-stringify/package.json M node_modules/restbase-mod-table-cassandra/node_modules/restbase-mod-table-spec/node_modules/routeswitch/node_modules/async/package.json A node_modules/service-runner/node_modules/hot-shots/CHANGES.md~ 9 files changed, 64 insertions(+), 24 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy refs/changes/94/271194/1 diff --git a/node_modules/content-type/package.json b/node_modules/content-type/package.json index c8860ca..716bfb8 100644 --- a/node_modules/content-type/package.json +++ b/node_modules/content-type/package.json @@ -44,7 +44,7 @@ }, "homepage": "https://github.com/jshttp/content-type#readme";, "_id": "content-type@1.0.1", - "_shasum": "bf8e3dd9b3ab4be91b02c7cc7e7b9a0efb0da680", + "_shasum": "7a614bb197ff960bf11d9fa84b8214edcecfaf0c", "_from": "git+https://github.com/wikimedia/content-type.git#master";, "_resolved": "git+https://github.com/wikimedia/content-type.git#47b2632d0a2ee79a7d67268e2f6621becd95d05b"; } diff --git a/node_modules/hyperswitch/lib/server.js b/node_modules/hyperswitch/lib/server.js index d1cbfa8..7333f97 100644 --- a/node_modules/hyperswitch/lib/server.js +++ b/node_modules/hyperswitch/lib/server.js @@ -327,6 +327,8 @@ } else { reqOpts.metrics = opts.child_metrics.internal; } + } else { + reqOpts.metrics = opts.child_metrics.external; } // Create a new, clean request object @@ -410,8 +412,9 @@ log: options.logger && options.logger.log.bind(options.logger) || function() {}, metrics: options.metrics, child_metrics: { - internal: options.metrics && options.metrics.makeChild('private'), - internal_update: options.metrics && options.metrics.makeChild('internal_update') + external: options.metrics && options.metrics.makeChild('external'), + internal: options.metrics && options.metrics.makeChild('internal'), + internal_update: options.metrics && options.metrics.makeChild('internal_update'), } }; @@ -452,4 +455,4 @@ main(); } else { module.exports = main; -} \ No newline at end of file +} 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 da87296..1f4ef5a 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": "json-stable-stringify@1.0.0", - "_shasum": "60d7db079b0cdf277ef09c8845bca99400ab08bb", + "_shasum": "b0fb91bda63ca2b5c71cf3b4af7d95301708357f", "_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 174a99e..9d21c94 100644 --- a/node_modules/hyperswitch/node_modules/swagger-ui/package.json +++ b/node_modules/hyperswitch/node_modules/swagger-ui/package.json @@ -60,7 +60,7 @@ "url": "https://github.com/swagger-api/swagger-ui/issues"; }, "_id": "swagger-ui@2.1.4", - "_shasum": "b0bad636fd37bea514a4078fb8fb47a5b913e7e3", + "_shasum": "789fb198f32d0a5ec3d7f9ce84a69c6665ae4446", "_from": "git+https://github.com/wikimedia/swagger-ui.git#master";, "_resolved": "git+https://github.com/wikimedia/swagger-ui.git#7bef30a93a3b81c55cb95d3ce9e0f9f53d5d8262"; } diff --git a/node_modules/hyperswitch/package.json b/node_modules/hyperswitch/package.json index 82f6e59..0781365 100644 --- a/node_modules/hyperswitch/package.json +++ b/node_modules/hyperswitch/package.json @@ -1,6 +1,6 @@ { "name": "hyperswitch", - "version": "0.1.4", + "version": "0.1.5", "description": "REST API creation framework", "main": "index.js", "scripts": { @@ -35,8 +35,8 @@ "cassandra-uuid": "^0.0.2", "preq": "^0.4.8", "swagger-router": "^0.4.0", - "swagger-ui": "git+https://github.com/wikimedia/swagger-ui.git#master";, - "json-stable-stringify": "git+https://github.com/wikimedia/json-stable-stringify.git#master";, + "swagger-ui": "git+https://github.com/wikimedia/swagger-ui#master";, + "json-stable-stringify": "git+https://github.com/wikimedia/json-stable-stringify#master";, "ajv": "^3.4.0" }, "devDependencies": { @@ -49,15 +49,14 @@ "nock": "^5.2.1", "service-runner": "^1.1.0" }, - "gitHead": "e2c61911684166ecf8b250cdf2eac3f380acaa41", - "_id": "hyperswitch@0.1.4", - "_shasum": "034712da2dea09e50ffd6465819ae52e48b88dac", + "gitHead": "81517d97a23a053f7d2098623704222c2377fa64", + "_id": "hyperswitch@0.1.5", + "_shasum": "b1625da41b2ac992938586527eefbac60d5f8d22", "_from": "hyperswitch@>=0.1.4 <0.2.0", - "_npmVersion": "2.14.12", - "_nodeVersion": "4.2.4", + "_npmVersion": "1.4.21", "_npmUser": { - "name": "doorman", - "email": "marko.obro...@gmail.com" + "name": "gwicke", + "email": "gabr...@gwicke.net" }, "maintainers": [ { @@ -78,13 +77,13 @@ } ], "dist": { - "shasum": "034712da2dea09e50ffd6465819ae52e48b88dac", - "tarball": "http://registry.npmjs.org/hyperswitch/-/hyperswitch-0.1.4.tgz"; + "shasum": "b1625da41b2ac992938586527eefbac60d5f8d22", + "tarball": "http://registry.npmjs.org/hyperswitch/-/hyperswitch-0.1.5.tgz"; }, "_npmOperationalInternal": { - "host": "packages-5-east.internal.npmjs.com", - "tmp": "tmp/hyperswitch-0.1.4.tgz_1455660139297_0.9148418398108333" + "host": "packages-6-west.internal.npmjs.com", + "tmp": "tmp/hyperswitch-0.1.5.tgz_1455681719058_0.9522641082294285" }, "directories": {}, - "_resolved": "https://registry.npmjs.org/hyperswitch/-/hyperswitch-0.1.4.tgz"; + "_resolved": "https://registry.npmjs.org/hyperswitch/-/hyperswitch-0.1.5.tgz"; } diff --git a/node_modules/json-stable-stringify/package.json b/node_modules/json-stable-stringify/package.json index ac5c164..d33bb45 100644 --- a/node_modules/json-stable-stringify/package.json +++ b/node_modules/json-stable-stringify/package.json @@ -50,7 +50,7 @@ "url": "https://github.com/substack/json-stable-stringify/issues"; }, "_id": "json-stable-stringify@1.0.0", - "_shasum": "53c6e1854d9573a2009af2a4fd98e0eaef0fc05a", + "_shasum": "51c94aa86e24833552c8c25eed06735e79bcbba0", "_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/restbase-mod-table-cassandra/node_modules/json-stable-stringify/package.json b/node_modules/restbase-mod-table-cassandra/node_modules/json-stable-stringify/package.json index da87296..1f4ef5a 100644 --- a/node_modules/restbase-mod-table-cassandra/node_modules/json-stable-stringify/package.json +++ b/node_modules/restbase-mod-table-cassandra/node_modules/json-stable-stringify/package.json @@ -50,7 +50,7 @@ "url": "https://github.com/substack/json-stable-stringify/issues"; }, "_id": "json-stable-stringify@1.0.0", - "_shasum": "60d7db079b0cdf277ef09c8845bca99400ab08bb", + "_shasum": "b0fb91bda63ca2b5c71cf3b4af7d95301708357f", "_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/restbase-mod-table-cassandra/node_modules/restbase-mod-table-spec/node_modules/routeswitch/node_modules/async/package.json b/node_modules/restbase-mod-table-cassandra/node_modules/restbase-mod-table-spec/node_modules/routeswitch/node_modules/async/package.json index dde1d1b..98c2e0b 100644 --- a/node_modules/restbase-mod-table-cassandra/node_modules/restbase-mod-table-spec/node_modules/routeswitch/node_modules/async/package.json +++ b/node_modules/restbase-mod-table-cassandra/node_modules/restbase-mod-table-spec/node_modules/routeswitch/node_modules/async/package.json @@ -79,5 +79,6 @@ "tarball": "http://registry.npmjs.org/async/-/async-0.9.2.tgz"; }, "directories": {}, - "_resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; + "_resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz";, + "readme": "ERROR: No README data found!" } diff --git a/node_modules/service-runner/node_modules/hot-shots/CHANGES.md~ b/node_modules/service-runner/node_modules/hot-shots/CHANGES.md~ new file mode 100644 index 0000000..211c088 --- /dev/null +++ b/node_modules/service-runner/node_modules/hot-shots/CHANGES.md~ @@ -0,0 +1,37 @@ +CHANGELOG +========= + +## HEAD (Unreleased) +none + +-------------------- + +## 2.3.0 (2015-1-17) +* @bdeitte Fix increment(name, 0) to send a 0 count instead of 1 +* @bdeitte Flush the queue when needed on close() + +## 2.2.0 (2015-1-10) +* @bdeitte Document and expand on close API +* @bdeitte Catch more error cases for callbacks + +## 2.1.2 (2015-12-9) +* @bdeitte Even more doc updates +* @mmoulton Fix multiple tags with Telegraf + +## 2.1.1 (2015-12-9) +* @bdeitte Doc updates + +## 2.1.0 (2015-12-9) +* @mmoulton Add options.telegraf to enable support for Telegraf's StatsD line protocol format +* @mmoulton Ensure message callback is sent in buffered case, even when we just buffer. + +## 2.0.0 (2015-10-22) +* @jjofseattle Add options.maxBufferSize and optinons.bufferFlushInterval +* @bdeitte Change options.global_tags to options.globalTags for conistency + +## 1.0.2 (2015-09-25) +* @ainsleyc Thrown error when cacheDNS flag fails to resolve DNS name + +## 1.0.1 (2015-09-24) +* @bdeitte Add the event API used by DogStatsD +* @sivy Start from the base of https://github.com/sivy/node-statsd -- To view, visit https://gerrit.wikimedia.org/r/271194 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5fcbdef0115708c1207b4d2c37c18558b9ad67f0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: GWicke <gwi...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
