Mobrovac has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/326034 )
Change subject: Update change-propagation to 04bed5d
......................................................................
Update change-propagation to 04bed5d
List of changes:
cb9560b Interleave continuation with leaf job processing
xxxxxxx Update the config template
xxxxxxx Update node module dependencies
Change-Id: I8204d79216170ee1c364e7d1d2a8f40bcc2ab47a
---
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/master.js
M
node_modules/service-runner/node_modules/limitation/node_modules/kad/package.json
M node_modules/service-runner/package.json
M scap/templates/config.yaml.j2
M src
7 files changed, 38 insertions(+), 27 deletions(-)
Approvals:
Mobrovac: Verified; Looks good to me, approved
Ppchelko: Looks good to me, but someone else must approve
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 1fd2d63..2726b69 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": "46a653f23d5529123f2a7623422996c0be7cfe91",
+ "_shasum": "37770e149b1b830102794ac8698cc6ea5b798392",
"_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 c239fb5..8199f87 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": "d56a34d13568e14ff5ca40c46d8efbf4ef4f3a55",
+ "_shasum": "c4bcd077ef57835b8775f0d23fc574913a05ec16",
"_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/master.js
b/node_modules/service-runner/lib/master.js
index 5ed417f..090f199 100644
--- a/node_modules/service-runner/lib/master.js
+++ b/node_modules/service-runner/lib/master.js
@@ -133,7 +133,9 @@
var self = this;
var worker = cluster.workers[workerId];
if (!worker || worker.state === 'disconnected') {
- delete self.workerStatusMap[worker.process.pid];
+ if (worker) {
+ delete self.workerStatusMap[worker.process.pid];
+ }
return;
}
self.workerStatusMap[worker.process.pid] = {
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 d7c7c0f..a1bba51 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": "48d03b345a24c4e984f504d5cf4a45408bc50b7b",
+ "_shasum": "c39e9b2b027c32e93af9913eeba1157970d6e5ef",
"_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/package.json
b/node_modules/service-runner/package.json
index 349996d..f8513e0 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.11",
+ "version": "2.1.12",
"description": "Generic nodejs service supervisor / cluster runner",
"main": "service-runner.js",
"bin": {
@@ -48,9 +48,9 @@
"mocha-jscs": "^5.0.1",
"bunyan-prettystream":
"git+https://github.com/hadfieldn/node-bunyan-prettystream.git#master";
},
- "gitHead": "a235e2f8460625cb5ee8fc64cc3071a5a070e063",
- "_id": "[email protected]",
- "_shasum": "1b0c83666beef6cc0637f0573a5107d107eac5bb",
+ "gitHead": "2de01b2a4f596ccf981e1878d4f2778c087000cc",
+ "_id": "[email protected]",
+ "_shasum": "e1848d2168287e76a09386929181510a26c1ae46",
"_from": "service-runner@>=2.1.7 <3.0.0",
"_npmVersion": "2.15.9",
"_nodeVersion": "4.6.0",
@@ -59,8 +59,8 @@
"email": "[email protected]"
},
"dist": {
- "shasum": "1b0c83666beef6cc0637f0573a5107d107eac5bb",
- "tarball":
"https://registry.npmjs.org/service-runner/-/service-runner-2.1.11.tgz";
+ "shasum": "e1848d2168287e76a09386929181510a26c1ae46",
+ "tarball":
"https://registry.npmjs.org/service-runner/-/service-runner-2.1.12.tgz";
},
"maintainers": [
{
@@ -77,9 +77,9 @@
}
],
"_npmOperationalInternal": {
- "host": "packages-18-east.internal.npmjs.com",
- "tmp": "tmp/service-runner-2.1.11.tgz_1479323631278_0.7561438775155693"
+ "host": "packages-12-west.internal.npmjs.com",
+ "tmp": "tmp/service-runner-2.1.12.tgz_1481155955250_0.02276564808562398"
},
"directories": {},
- "_resolved":
"https://registry.npmjs.org/service-runner/-/service-runner-2.1.11.tgz";
+ "_resolved":
"https://registry.npmjs.org/service-runner/-/service-runner-2.1.12.tgz";
}
diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index a50f73c..c59bc2c 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -307,19 +307,28 @@
on_transclusion_update:
concurrency: <%= concurrency * 8 %>
topic: change-prop.transcludes.resource-change
- match:
- meta:
- uri: '/https?:\/\/[^\/]+\/wiki\/(?<title>.+)/'
- tags: [ 'transcludes' ]
- exec:
- method: get
- uri: '<%= restbase_uri
%>/{{message.meta.domain}}/v1/page/html/{{match.meta.uri.title}}'
- headers:
- cache-control: no-cache
- if-unmodified-since: '{{date(message.meta.dt)}}'
- x-restbase-mode: '{{message.tags[1]}}'
- query:
- redirect: false
+ cases:
+ - match:
+ meta:
+ schema_uri: 'resource_change/1'
+ uri: '/https?:\/\/[^\/]+\/wiki\/(?<title>.+)/'
+ tags: [ 'transcludes' ]
+ exec:
+ method: get
+ uri: '<%= restbase_uri
%>/{{message.meta.domain}}/v1/page/html/{{match.meta.uri.title}}'
+ headers:
+ cache-control: no-cache
+ if-unmodified-since: '{{date(message.meta.dt)}}'
+ x-restbase-mode: '{{message.tags[1]}}'
+ query:
+ redirect: false
+ - match:
+ meta:
+ schema_uri: 'continue/1'
+ exec:
+ method: post
+ uri:
'/sys/links/transcludes/{message.original_event.page_title}'
+ body: '{{globals.message}}'
# ORES caching updates
ores_cache:
diff --git a/src b/src
index 0e46d7a..04bed5d 160000
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit 0e46d7a60950dc087024e5fafdcd8a2ad4299e25
+Subproject commit 04bed5da233b8b156f7d36afce6492371088493d
--
To view, visit https://gerrit.wikimedia.org/r/326034
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8204d79216170ee1c364e7d1d2a8f40bcc2ab47a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/change-propagation/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac <[email protected]>
Gerrit-Reviewer: Mobrovac <[email protected]>
Gerrit-Reviewer: Ppchelko <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
