GWicke has uploaded a new change for review.
https://gerrit.wikimedia.org/r/192067
Change subject: Update dependencies
......................................................................
Update dependencies
Change-Id: I09769e5641fdfeffcdb022f2e2bca0b5ef88b46b
---
M
node_modules/busboy/node_modules/readable-stream/node_modules/inherits/package.json
M node_modules/istanbul/node_modules/async/package.json
M node_modules/istanbul/node_modules/mkdirp/package.json
M node_modules/mocha/node_modules/mkdirp/package.json
M node_modules/restbase-mod-table-cassandra/node_modules/async/package.json
M
node_modules/restbase-mod-table-cassandra/node_modules/restify/node_modules/lru-cache/package.json
M node_modules/service-runner/lib/heapwatch.js
M node_modules/service-runner/package.json
8 files changed, 16 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy
refs/changes/67/192067/1
diff --git
a/node_modules/busboy/node_modules/readable-stream/node_modules/inherits/package.json
b/node_modules/busboy/node_modules/readable-stream/node_modules/inherits/package.json
index 754a114..3d69f4f 100644
---
a/node_modules/busboy/node_modules/readable-stream/node_modules/inherits/package.json
+++
b/node_modules/busboy/node_modules/readable-stream/node_modules/inherits/package.json
@@ -32,7 +32,7 @@
"shasum": "b17d08d326b4423e568eff719f91b0b1cbdf69f1",
"tarball": "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
},
- "_from": "inherits@2",
+ "_from": "inherits@~2.0.1",
"_npmVersion": "1.3.8",
"_npmUser": {
"name": "isaacs",
diff --git a/node_modules/istanbul/node_modules/async/package.json
b/node_modules/istanbul/node_modules/async/package.json
index bdbe740..9d15cd7 100644
--- a/node_modules/istanbul/node_modules/async/package.json
+++ b/node_modules/istanbul/node_modules/async/package.json
@@ -41,7 +41,7 @@
"shasum": "ac3613b1da9bed1b47510bb4651b8931e47146c7",
"tarball": "http://registry.npmjs.org/async/-/async-0.9.0.tgz";
},
- "_from": "async@~0.9.0",
+ "_from": "[email protected]",
"_npmVersion": "1.4.3",
"_npmUser": {
"name": "caolan",
diff --git a/node_modules/istanbul/node_modules/mkdirp/package.json
b/node_modules/istanbul/node_modules/mkdirp/package.json
index a6de8f3..b7fe466 100644
--- a/node_modules/istanbul/node_modules/mkdirp/package.json
+++ b/node_modules/istanbul/node_modules/mkdirp/package.json
@@ -39,7 +39,7 @@
"shasum": "1d73076a6df986cd9344e15e71fcc05a4c9abf12",
"tarball": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";
},
- "_from": "mkdirp@~0.5.0",
+ "_from": "[email protected]",
"_npmVersion": "1.4.3",
"_npmUser": {
"name": "substack",
diff --git a/node_modules/mocha/node_modules/mkdirp/package.json
b/node_modules/mocha/node_modules/mkdirp/package.json
index a6de8f3..b7fe466 100644
--- a/node_modules/mocha/node_modules/mkdirp/package.json
+++ b/node_modules/mocha/node_modules/mkdirp/package.json
@@ -39,7 +39,7 @@
"shasum": "1d73076a6df986cd9344e15e71fcc05a4c9abf12",
"tarball": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";
},
- "_from": "mkdirp@~0.5.0",
+ "_from": "[email protected]",
"_npmVersion": "1.4.3",
"_npmUser": {
"name": "substack",
diff --git
a/node_modules/restbase-mod-table-cassandra/node_modules/async/package.json
b/node_modules/restbase-mod-table-cassandra/node_modules/async/package.json
index bdbe740..9d15cd7 100644
--- a/node_modules/restbase-mod-table-cassandra/node_modules/async/package.json
+++ b/node_modules/restbase-mod-table-cassandra/node_modules/async/package.json
@@ -41,7 +41,7 @@
"shasum": "ac3613b1da9bed1b47510bb4651b8931e47146c7",
"tarball": "http://registry.npmjs.org/async/-/async-0.9.0.tgz";
},
- "_from": "async@~0.9.0",
+ "_from": "[email protected]",
"_npmVersion": "1.4.3",
"_npmUser": {
"name": "caolan",
diff --git
a/node_modules/restbase-mod-table-cassandra/node_modules/restify/node_modules/lru-cache/package.json
b/node_modules/restbase-mod-table-cassandra/node_modules/restify/node_modules/lru-cache/package.json
index be2cfc9..2474729 100644
---
a/node_modules/restbase-mod-table-cassandra/node_modules/restify/node_modules/lru-cache/package.json
+++
b/node_modules/restbase-mod-table-cassandra/node_modules/restify/node_modules/lru-cache/package.json
@@ -31,7 +31,7 @@
"shasum": "d82388ae9c960becbea0c73bb9eb79b6c6ce9aeb",
"tarball": "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz";
},
- "_from": "lru-cache@^2.5.0",
+ "_from": "lru-cache@2",
"_npmVersion": "1.3.15",
"_npmUser": {
"name": "isaacs",
diff --git a/node_modules/service-runner/lib/heapwatch.js
b/node_modules/service-runner/lib/heapwatch.js
index 533b828..58a276d 100644
--- a/node_modules/service-runner/lib/heapwatch.js
+++ b/node_modules/service-runner/lib/heapwatch.js
@@ -14,11 +14,13 @@
HeapWatch.prototype.watch = function() {
var usage = process.memoryUsage();
- // Report memory stats to statsd
+ // Report memory stats to statsd. Use 'timing' (which isn't really
+ // timing-specific at all) instead of 'gauge' to get percentiles &
+ // min/max.
var statsd = this.statsd;
- statsd.gauge('heap.rss', usage.rss);
- statsd.gauge('heap.total', usage.heapTotal);
- statsd.gauge('heap.used', usage.heapUsed);
+ statsd.timing('heap.rss', usage.rss);
+ statsd.timing('heap.total', usage.heapTotal);
+ statsd.timing('heap.used', usage.heapUsed);
if (usage.heapUsed > this.limit) {
console.log(usage.heapUsed, this.limit);
diff --git a/node_modules/service-runner/package.json
b/node_modules/service-runner/package.json
index b8a7163..56a6be0 100644
--- a/node_modules/service-runner/package.json
+++ b/node_modules/service-runner/package.json
@@ -1,6 +1,6 @@
{
"name": "service-runner",
- "version": "0.1.1",
+ "version": "0.1.2",
"description": "Generic nodejs service supervisor / cluster runner",
"main": "service-runner.js",
"bin": {
@@ -52,8 +52,8 @@
},
"readme": "# service-runner\nGeneric nodejs service runner &
supervisor\n\n## Goals\n- Supervise and cluster node services in a generic
manner with a minimal interface:\n\n```javascript\nmodule.exports = function
(options) {\n var config = options.config;\n // Logger instance\n var
logger = options.logger;\n // Statsd metrics reporter\n var statsd =
options.statsd;\n\n // Start the app, returning a promise\n return
startApp(config, logger, statsd);\n}\n```\n\n- standard command line
parameters:\n```bash\nUsage: node ./service-runner.js [-h|-v]
[--param[=val]]\n\nOptions:\n -n, --num-workers [default: -1]\n -c, --config
[default: \"./config.yaml\"]\n -v, --version [default: false]\n
-h, --help [default: false]\n```\n- [config
loading](#config-loading)\n- flexible logging using bunyan, including logstash
support via gelf\n- metric reporting using txstatsd\n- heap dumps\n\n##
Usage\n```bash\nnpm install --save service-runner\n```\n\nIn package.json,
configure `npm start` to call service-runner:\n```javascript\n \"scripts\":
{\n \"start\": \"service-runner\"\n }\n```\nCreate a `config.yaml` file
following the spec below. Make sure to point the\nmodule parameter to your
service's entry point.\n\nFinally, **start your service with `npm start`**. In
npm >= 2.0 (node 0.12 or iojs), you can also pass parameters to
`service-runner` like this: `npm start -- -c
/etc/yourservice/config.yaml`.\n\nFor node 0.10 support, you can create a small
wrapper script like this:\n```javascript\nvar ServiceRunner =
require('service-runner');\nnew ServiceRunner().run();\n```\n\nWe are also
working on a
[standard\ntemplate](https://github.com/wikimedia/service-template-node) for
node\nservices, which will set up this & other things for you.\n\n### Config
loading\n- Default config locations in a project: `config.yaml` for a
customized config,\n and `config.example.yaml` for the defaults.\n- Default
top-level config format (**draft**):\n\n```yaml\n# Info about this config. Used
for packaging & other purposes.\ninfo: \n name: parsoid\n version: 0.4.0\n
description: Bidirectional conversion service between MediaWiki wikitext and\n
HTML5\n\n# Package settings. Modeled on Debian, but likely to transfer to
rpm as well.\npackaging:\n depends:\n nodejs: >=0.10.0\n enhances:
mediawiki\n\n\n# Number of worker processes to spawn. \n# Set to 0 to run
everything in a single process without clustering.\nnum_workers: 1\n\n# Logger
info\nlogging:\n level: info\n streams:\n # Use gelf-stream -> logstash\n -
type: gelf\n host: logstash1003.eqiad.wmnet\n port: 12201\n\n# Statsd
metrics reporter\nmetrics:\n type: txstatsd\n host: localhost\n port:
8125\n\nservices:\n - name: parsoid\n # a relative path or the name of an
npm package, if different from name\n # module: ./lib/server.js\n\n #
optionally, a version constraint of the npm package\n # version: ^0.4.0\n
\n # per-service config\n conf:\n port: 12345\n interface:
localhost\n # more per-service config settings\n```\n\n# Issue
tracking\n\nPlease report issues in [the service-runner
phabricator\nproject](https://phabricator.wikimedia.org/tag/service-runner/).\n\n#
See also\n- https://github.com/Unitech/PM2/ - A lot of features. Focus on
interactive\n use with commandline tools. Weak on logging (only local log
files). Does\n not support node 0.10's cluster module.\n-
https://github.com/strongloop/strong-agent - commercial license. Focus on\n
profiling and monitoring, although a lot of the functionality is now\n
available in other libraries.\n- http://krakenjs.com/ - Focused more on MVC &
templating rather than\n supervision & modules\n",
"readmeFilename": "README.md",
- "gitHead": "89201d5588b02dfd50123cf89cf1405ee1907511",
- "_id": "[email protected]",
- "_shasum": "55ea430fbc62dd8a860e2412ab46253faeebd920",
+ "gitHead": "cc47d99d34020262973763914c413adf768e022f",
+ "_id": "[email protected]",
+ "_shasum": "32bba0aa1710dd5eb99034268b4fb6c0bba0966c",
"_from": "service-runner@^0.1.0"
}
--
To view, visit https://gerrit.wikimedia.org/r/192067
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I09769e5641fdfeffcdb022f2e2bca0b5ef88b46b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: GWicke <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
