Mobrovac has submitted this change and it was merged.
Change subject: Update change-propagation to b7383d4
......................................................................
Update change-propagation to b7383d4
List of changes:
xxxxxxx Update node module dependencies
Change-Id: I40e845dc3f26fc824990054eeab8101c07836832
---
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/node_modules/limitation/node_modules/kad/package.json
M node_modules/wmf-kafka-node/lib/zookeeper.js
M
node_modules/wmf-kafka-node/node_modules/snappy/build/Release/obj.target/deps/snappy/snappy.a
M node_modules/wmf-kafka-node/node_modules/snappy/build/Release/snappy.a
M node_modules/wmf-kafka-node/package.json
7 files changed, 36 insertions(+), 33 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 b9995f1..8d63e0e 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": "fc6320d15db93772e8b6e39a686083b580450d7f",
+ "_shasum": "32d24110aec0bc869336f1e1abe2d4b6e477f629",
"_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 7be4846..eb524df 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": "[email protected]",
- "_shasum": "e94421fcae1f81109cfe50ae1aeaad733a155ff8",
+ "_shasum": "1deb38249dc339c599b5fbf256955b163bd44a4a",
"_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/service-runner/node_modules/limitation/node_modules/kad/package.json
b/node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
index dc2dae9..690894e 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": "0189510303a232f7f8d385372fede9889cd26564",
+ "_shasum": "fa193d6cee4c1cdd9c97fb1765808a63a2cfe9df",
"_from": "git+https://github.com/gwicke/kad.git#master";,
"_resolved":
"git+https://github.com/gwicke/kad.git#31449a27a289b6f0ecbeec193d8bac9db8b9f513";
}
diff --git a/node_modules/wmf-kafka-node/lib/zookeeper.js
b/node_modules/wmf-kafka-node/lib/zookeeper.js
index 4a8e36e..4370acc 100644
--- a/node_modules/wmf-kafka-node/lib/zookeeper.js
+++ b/node_modules/wmf-kafka-node/lib/zookeeper.js
@@ -145,29 +145,32 @@
path,
function (error, data) {
if (error) {
- cbb(error);
- }
- else {
- try {
- var obj = data ?
JSON.parse(data.toString()) : {};
- // For each topic
- for (var topic in
obj.subscription) {
- if
(consumerPerTopicMap.topicConsumerMap[topic] == undefined) {
-
consumerPerTopicMap.topicConsumerMap[topic] = [];
- }
-
consumerPerTopicMap.topicConsumerMap[topic].push(consumer);
-
- if
(consumerPerTopicMap.consumerTopicMap[consumer] == undefined) {
-
consumerPerTopicMap.consumerTopicMap[consumer] = [];
- }
-
consumerPerTopicMap.consumerTopicMap[consumer].push(topic);
- }
-
- cbb();
- } catch (e) {
- debug(e);
- cbb(new Error("Unable to assemble
data"));
+ // when NO_NODE happens here, a
consumer has left abruptly
+ // and ZK doesn't know it yet
+ if(/NO_NODE/.test(error.toString())) {
+ return cbb();
}
+ return cbb(error);
+ }
+ try {
+ var obj = data ?
JSON.parse(data.toString()) : {};
+ // For each topic
+ for (var topic in obj.subscription) {
+ if
(consumerPerTopicMap.topicConsumerMap[topic] == undefined) {
+
consumerPerTopicMap.topicConsumerMap[topic] = [];
+ }
+
consumerPerTopicMap.topicConsumerMap[topic].push(consumer);
+
+ if
(consumerPerTopicMap.consumerTopicMap[consumer] == undefined) {
+
consumerPerTopicMap.consumerTopicMap[consumer] = [];
+ }
+
consumerPerTopicMap.consumerTopicMap[consumer].push(topic);
+ }
+
+ cbb();
+ } catch (e) {
+ debug(e);
+ cbb(new Error("Unable to assemble
data"));
}
}
);
diff --git
a/node_modules/wmf-kafka-node/node_modules/snappy/build/Release/obj.target/deps/snappy/snappy.a
b/node_modules/wmf-kafka-node/node_modules/snappy/build/Release/obj.target/deps/snappy/snappy.a
index 450e6d0..9a18cc9 100644
---
a/node_modules/wmf-kafka-node/node_modules/snappy/build/Release/obj.target/deps/snappy/snappy.a
+++
b/node_modules/wmf-kafka-node/node_modules/snappy/build/Release/obj.target/deps/snappy/snappy.a
Binary files differ
diff --git
a/node_modules/wmf-kafka-node/node_modules/snappy/build/Release/snappy.a
b/node_modules/wmf-kafka-node/node_modules/snappy/build/Release/snappy.a
index 450e6d0..9a18cc9 100644
--- a/node_modules/wmf-kafka-node/node_modules/snappy/build/Release/snappy.a
+++ b/node_modules/wmf-kafka-node/node_modules/snappy/build/Release/snappy.a
Binary files differ
diff --git a/node_modules/wmf-kafka-node/package.json
b/node_modules/wmf-kafka-node/package.json
index a5e7e24..a563a69 100644
--- a/node_modules/wmf-kafka-node/package.json
+++ b/node_modules/wmf-kafka-node/package.json
@@ -1,7 +1,7 @@
{
"name": "wmf-kafka-node",
"description": "node client for Apache kafka, only support kafka 0.8 and
above",
- "version": "0.1.7",
+ "version": "0.1.9",
"main": "kafka.js",
"dependencies": {
"async": ">0.9 <2.0",
@@ -32,13 +32,13 @@
"scripts": {
"test": "make test"
},
- "gitHead": "9e4c6a650886686724ab560c1656f466c81b0eaf",
+ "gitHead": "2e82130f75a8e9d6093711eda73210a3993037da",
"bugs": {
"url": "https://github.com/d00rman/kafka-node/issues";
},
"homepage": "https://github.com/d00rman/kafka-node#readme";,
- "_id": "[email protected]",
- "_shasum": "db25b8e23d648cc5e2c4ed5264e95ba2e31c3bfd",
+ "_id": "[email protected]",
+ "_shasum": "ebaf32b32fb2cc44e0dcac9560d00cad89d41341",
"_from": "wmf-kafka-node@>=0.1.7 <0.2.0",
"_npmVersion": "2.14.12",
"_nodeVersion": "4.3.0",
@@ -47,8 +47,8 @@
"email": "[email protected]"
},
"dist": {
- "shasum": "db25b8e23d648cc5e2c4ed5264e95ba2e31c3bfd",
- "tarball":
"https://registry.npmjs.org/wmf-kafka-node/-/wmf-kafka-node-0.1.7.tgz";
+ "shasum": "ebaf32b32fb2cc44e0dcac9560d00cad89d41341",
+ "tarball":
"https://registry.npmjs.org/wmf-kafka-node/-/wmf-kafka-node-0.1.9.tgz";
},
"maintainers": [
{
@@ -58,8 +58,8 @@
],
"_npmOperationalInternal": {
"host": "packages-16-east.internal.npmjs.com",
- "tmp": "tmp/wmf-kafka-node-0.1.7.tgz_1465492631650_0.6422846862114966"
+ "tmp": "tmp/wmf-kafka-node-0.1.9.tgz_1465908433880_0.12020742218010128"
},
"directories": {},
- "_resolved":
"https://registry.npmjs.org/wmf-kafka-node/-/wmf-kafka-node-0.1.7.tgz";
+ "_resolved":
"https://registry.npmjs.org/wmf-kafka-node/-/wmf-kafka-node-0.1.9.tgz";
}
--
To view, visit https://gerrit.wikimedia.org/r/294299
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I40e845dc3f26fc824990054eeab8101c07836832
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
