GWicke has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181704
Change subject: Pull in improved timeout handling in the cassandra driver
......................................................................
Pull in improved timeout handling in the cassandra driver
Change-Id: I184a19994cc87529aba8f8254d5f7e8f02af90c0
---
M node_modules/istanbul/node_modules/mkdirp/node_modules/minimist/package.json
M node_modules/js-yaml/package.json
M
node_modules/mocha-jshint/node_modules/jshint/node_modules/htmlparser2/node_modules/readable-stream/package.json
M node_modules/mocha-jshint/node_modules/jshint/package.json
M node_modules/mocha/node_modules/debug/package.json
M node_modules/mocha/node_modules/glob/package.json
M node_modules/mocha/node_modules/jade/package.json
M node_modules/mocha/node_modules/mkdirp/package.json
M node_modules/preq/node_modules/bluebird/package.json
M
node_modules/restbase-cassandra/node_modules/cassandra-driver/lib/connection.js
M node_modules/restbase-cassandra/node_modules/cassandra-driver/package.json
11 files changed, 28 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy
refs/changes/04/181704/1
diff --git
a/node_modules/istanbul/node_modules/mkdirp/node_modules/minimist/package.json
b/node_modules/istanbul/node_modules/mkdirp/node_modules/minimist/package.json
index 7cd80f4..09e9ec4 100644
---
a/node_modules/istanbul/node_modules/mkdirp/node_modules/minimist/package.json
+++
b/node_modules/istanbul/node_modules/mkdirp/node_modules/minimist/package.json
@@ -62,5 +62,6 @@
],
"directories": {},
"_shasum": "857fcabfc3397d2625b8228262e86aa7a011b05d",
- "_resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+ "_resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";,
+ "readme": "ERROR: No README data found!"
}
diff --git a/node_modules/js-yaml/package.json
b/node_modules/js-yaml/package.json
index bb02a13..9e9602c 100644
--- a/node_modules/js-yaml/package.json
+++ b/node_modules/js-yaml/package.json
@@ -78,5 +78,6 @@
"tarball": "http://registry.npmjs.org/js-yaml/-/js-yaml-3.2.4.tgz";
},
"directories": {},
- "_resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.2.4.tgz";
+ "_resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.2.4.tgz";,
+ "readme": "ERROR: No README data found!"
}
diff --git
a/node_modules/mocha-jshint/node_modules/jshint/node_modules/htmlparser2/node_modules/readable-stream/package.json
b/node_modules/mocha-jshint/node_modules/jshint/node_modules/htmlparser2/node_modules/readable-stream/package.json
index 152dcc5..524d8eb 100644
---
a/node_modules/mocha-jshint/node_modules/jshint/node_modules/htmlparser2/node_modules/readable-stream/package.json
+++
b/node_modules/mocha-jshint/node_modules/jshint/node_modules/htmlparser2/node_modules/readable-stream/package.json
@@ -40,7 +40,7 @@
"homepage": "https://github.com/isaacs/readable-stream";,
"_id": "readable-stream@1.1.13",
"_shasum": "f6eef764f514c89e2b9e23146a75ba106756d23e",
- "_from": "readable-stream@1.1",
+ "_from": "readable-stream@1.1.x",
"_npmVersion": "1.4.23",
"_npmUser": {
"name": "rvagg",
diff --git a/node_modules/mocha-jshint/node_modules/jshint/package.json
b/node_modules/mocha-jshint/node_modules/jshint/package.json
index 4e50092..fbc8a84 100644
--- a/node_modules/mocha-jshint/node_modules/jshint/package.json
+++ b/node_modules/mocha-jshint/node_modules/jshint/package.json
@@ -84,5 +84,6 @@
"tarball": "http://registry.npmjs.org/jshint/-/jshint-2.5.11.tgz";
},
"directories": {},
- "_resolved": "https://registry.npmjs.org/jshint/-/jshint-2.5.11.tgz";
+ "_resolved": "https://registry.npmjs.org/jshint/-/jshint-2.5.11.tgz";,
+ "readme": "ERROR: No README data found!"
}
diff --git a/node_modules/mocha/node_modules/debug/package.json
b/node_modules/mocha/node_modules/debug/package.json
index e3c906e..f516035 100644
--- a/node_modules/mocha/node_modules/debug/package.json
+++ b/node_modules/mocha/node_modules/debug/package.json
@@ -66,5 +66,6 @@
"tarball": "http://registry.npmjs.org/debug/-/debug-2.0.0.tgz";
},
"directories": {},
- "_resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz";
+ "_resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz";,
+ "readme": "ERROR: No README data found!"
}
diff --git a/node_modules/mocha/node_modules/glob/package.json
b/node_modules/mocha/node_modules/glob/package.json
index b00d5b9..aa7a4e2 100644
--- a/node_modules/mocha/node_modules/glob/package.json
+++ b/node_modules/mocha/node_modules/glob/package.json
@@ -51,5 +51,6 @@
],
"directories": {},
"_shasum": "e313eeb249c7affaa5c475286b0e115b59839467",
- "_resolved": "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz";
+ "_resolved": "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz";,
+ "readme": "ERROR: No README data found!"
}
diff --git a/node_modules/mocha/node_modules/jade/package.json
b/node_modules/mocha/node_modules/jade/package.json
index 14198af..191cb4d 100644
--- a/node_modules/mocha/node_modules/jade/package.json
+++ b/node_modules/mocha/node_modules/jade/package.json
@@ -52,5 +52,9 @@
"directories": {},
"_shasum": "8f10d7977d8d79f2f6ff862a81b0513ccb25686c",
"_from": "jade@0.26.3",
- "_resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz";
+ "_resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz";,
+ "bugs": {
+ "url": "https://github.com/visionmedia/jade/issues";
+ },
+ "readme": "ERROR: No README data found!"
}
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": "mkdirp@0.5.x",
"_npmVersion": "1.4.3",
"_npmUser": {
"name": "substack",
diff --git a/node_modules/preq/node_modules/bluebird/package.json
b/node_modules/preq/node_modules/bluebird/package.json
index 2368777..febfeca 100644
--- a/node_modules/preq/node_modules/bluebird/package.json
+++ b/node_modules/preq/node_modules/bluebird/package.json
@@ -91,5 +91,6 @@
"tarball": "http://registry.npmjs.org/bluebird/-/bluebird-2.4.2.tgz";
},
"directories": {},
- "_resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.4.2.tgz";
+ "_resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.4.2.tgz";,
+ "readme": "ERROR: No README data found!"
}
diff --git
a/node_modules/restbase-cassandra/node_modules/cassandra-driver/lib/connection.js
b/node_modules/restbase-cassandra/node_modules/cassandra-driver/lib/connection.js
index ed8567c..168f066 100644
---
a/node_modules/restbase-cassandra/node_modules/cassandra-driver/lib/connection.js
+++
b/node_modules/restbase-cassandra/node_modules/cassandra-driver/lib/connection.js
@@ -66,12 +66,17 @@
this.netClient.removeAllListeners('connect');
this.netClient.removeAllListeners('timeout');
var self = this;
- this.netClient.on('close', function() {
+
+ // Make sure we handle errors and timeouts during startup
+ function closedConnectionHandler() {
self.log('info', 'Connection to ' + self.address + ':' + self.port + '
closed');
self.connected = false;
self.connecting = false;
self.invokePendingCallbacks();
- });
+ }
+ this.netClient.on('timeout', closedConnectionHandler);
+ this.netClient.on('close', closedConnectionHandler);
+
this.netClient
.pipe(protocol)
.pipe(this.parser)
diff --git
a/node_modules/restbase-cassandra/node_modules/cassandra-driver/package.json
b/node_modules/restbase-cassandra/node_modules/cassandra-driver/package.json
index 882a2cd..667e842 100644
--- a/node_modules/restbase-cassandra/node_modules/cassandra-driver/package.json
+++ b/node_modules/restbase-cassandra/node_modules/cassandra-driver/package.json
@@ -44,7 +44,7 @@
"url": "https://github.com/datastax/nodejs-driver/issues";
},
"_id": "cassandra-driver@1.0.2",
- "_shasum": "88dbaf36827a90625e671c61f0b05e2ab8f0ed95",
- "_resolved":
"git+https://github.com/gwicke/nodejs-driver.git#2dcb4b6b886809d65e28775b71c006aca0b0da22";,
+ "_shasum": "46953db56d58e298e1ae605f5c4896e355a8faa1",
+ "_resolved":
"git+https://github.com/gwicke/nodejs-driver.git#2051d1575c823384d37e690532244eeacdf80efc";,
"_from":
"cassandra-driver@git+https://github.com/gwicke/nodejs-driver.git#keepalive";
}
--
To view, visit https://gerrit.wikimedia.org/r/181704
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I184a19994cc87529aba8f8254d5f7e8f02af90c0
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
