Mwalker has submitted this change and it was merged.
Change subject: Accept status from renderer
......................................................................
Accept status from renderer
Change-Id: I6192547bc2d30d4f4ab1fc686871b74ffe916019
---
M lib/JobDetails.js
M lib/backend.js
2 files changed, 9 insertions(+), 3 deletions(-)
Approvals:
Mwalker: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/JobDetails.js b/lib/JobDetails.js
index d9fa63d..d28fb78 100644
--- a/lib/JobDetails.js
+++ b/lib/JobDetails.js
@@ -126,7 +126,7 @@
jd.status.status = status;
jd.status.article = article;
- jd.status.progress = progress;
+ jd.status.progress = 0.5 * parseFloat(progress);
jd.status.page = null;
};
exports.updateRendering = function(jd, page, status, progress) {
@@ -135,7 +135,7 @@
jd.status.status = status;
jd.status.article = null;
- jd.status.progress = progress;
+ jd.status.progress = 50 + 0.5 * parseFloat(progress);
jd.status.page = page;
};
exports.updateFinished = function(jd, file, url, type, name, length) {
diff --git a/lib/backend.js b/lib/backend.js
index febdd2d..9b4bc11 100644
--- a/lib/backend.js
+++ b/lib/backend.js
@@ -218,7 +218,13 @@
getNewItemFromQueue();
});
child.on('message', function(message, handle) {
- console.info('Received message from child! %s', message);
+ try {
+ var msgObj = JSON.parse(message);
+ jd.updateRendering(jobDetails, msgObj.file,
msgObj.status, msgObj.percent);
+ redisClient.hset(config.get('redis:status_set_name'),
jobDetails.collectionId, JSON.stringify(jobDetails));
+ } catch (err) {
+ // Pass
+ }
});
child.on('exit', function(code, signal) {
console.info('Rendering child exited with: %s', code);
--
To view, visit https://gerrit.wikimedia.org/r/96971
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6192547bc2d30d4f4ab1fc686871b74ffe916019
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Collection/OfflineContentGenerator
Gerrit-Branch: master
Gerrit-Owner: Mwalker <mwal...@wikimedia.org>
Gerrit-Reviewer: Mwalker <mwal...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
