Mobrovac has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/325955 )
Change subject: Update trending-edits to 0e407e1
......................................................................
Update trending-edits to 0e407e1
List of changes:
0715627 Record bytes change
6277c39 Use Map for storing trending information
1da3d4a Edit stream should replay edits up to the maximum age
5f747fe Process and respond only to enwiki events
0e407e1 Score and sort pages before exposing
xxxxxxx Update config
xxxxxxx Update node module dependencies
Change-Id: If89bacd40d1fad78c60dba4caa3ded1429f20feb
---
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
5 files changed, 17 insertions(+), 13 deletions(-)
Approvals:
Mobrovac: Verified; Looks good to me, approved
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 6d0c958..fb82ff8 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": "kad@1.3.6",
- "_shasum": "a0910f35edfae83d7616c34c2c3b1649ad4f91c9",
+ "_shasum": "205a7c771376a0d8e4e19ab3790228ab99202469",
"_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 089c7ca..e05062a 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": "service-runner@2.1.11",
- "_shasum": "1b0c83666beef6cc0637f0573a5107d107eac5bb",
+ "gitHead": "2de01b2a4f596ccf981e1878d4f2778c087000cc",
+ "_id": "service-runner@2.1.12",
+ "_shasum": "e1848d2168287e76a09386929181510a26c1ae46",
"_from": "service-runner@>=2.1.10 <3.0.0",
"_npmVersion": "2.15.9",
"_nodeVersion": "4.6.0",
@@ -59,8 +59,8 @@
"email": "petrpche...@gmail.com"
},
"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 2e408f6..6700ea6 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -69,6 +69,8 @@
user_agent: WMF Trending Edits
# which datacenters to consume edit events from
consume_dc: [ <%= site %> ]
+ # the number of results to return
+ max_results: 20
# purge contents of store after this number of events
purge_period: 100
# the service's purge strategy parameters
@@ -78,7 +80,7 @@
# maximum time in minutes a page can go without edits
max_inactivity: 40
# maximum age allowed in minutes
- max_age: 1440
+ max_age: 60
# minimum speed in edits per minute that a page is kept around
min_speed: 0.1
# calculate trending for one hour
diff --git a/src b/src
index 29a9e6a..0e407e1 160000
--- a/src
+++ b/src
@@ -1 +1 @@
-Subproject commit 29a9e6a1b8e9d23ced46aae7639532d6ffa1a31f
+Subproject commit 0e407e171fd2419aa9ee8f33755c9ef4afe3da6c
--
To view, visit https://gerrit.wikimedia.org/r/325955
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If89bacd40d1fad78c60dba4caa3ded1429f20feb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/trending-edits/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
