Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/96534
Change subject: Fix jshint errors
......................................................................
Fix jshint errors
Change-Id: Iee9a0803feef793143d8da9e4d1dbcf885c096f6
---
M lib/RedisWrapper.js
M lib/backend.js
M lib/frontend.js
M mw-collection-ocg.js
4 files changed, 15 insertions(+), 14 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Collection/OfflineContentGenerator
refs/changes/34/96534/1
diff --git a/lib/RedisWrapper.js b/lib/RedisWrapper.js
index 12bfa9c..77d5797 100644
--- a/lib/RedisWrapper.js
+++ b/lib/RedisWrapper.js
@@ -1,3 +1,4 @@
+var util = require('util');
var events = require('events');
var redis = require('redis');
@@ -24,7 +25,7 @@
* closed: On connection closed (by close() or error)
* @type {events.EventEmitter}
*/
-RedisWrapper.prototype = new events.EventEmitter;
+util.inherits(RedisWrapper, events.EventEmitter);
/**
* Connect to the redis server. Emits 'ready' when connected.
@@ -101,4 +102,4 @@
return this.client.hget(hash, key, callback);
};
-module.exports = RedisWrapper;
\ No newline at end of file
+module.exports = RedisWrapper;
diff --git a/lib/backend.js b/lib/backend.js
index 77d28d7..ca0bf70 100644
--- a/lib/backend.js
+++ b/lib/backend.js
@@ -41,7 +41,7 @@
function initBackend(nconf) {
config = nconf;
if (!config.get('backend:temp_dir')) {
- config.set('backend:temp_dir', os.tmpdir())
+ config.set('backend:temp_dir', os.tmpdir());
}
redisClient = new Redis(
@@ -57,7 +57,7 @@
function startBackend() {
var loop = false;
redisClient.on('closed', function() {
- if (loop == false) {
+ if (!loop) {
loop = true;
console.error('Redis died!?');
stopBackend(process.exit);
diff --git a/lib/frontend.js b/lib/frontend.js
index 3ad6ecd..dcca7c5 100644
--- a/lib/frontend.js
+++ b/lib/frontend.js
@@ -63,7 +63,7 @@
var loop = false;
redisClient.on('closed', function() {
- if (loop == false) {
+ if (!loop) {
loop = true;
console.error('Redis died!?');
stopServer(process.exit);
@@ -180,7 +180,6 @@
break;
default:
throw new FrontendError('Unrecognized command',
400);
- break;
}
} catch(err) {
if (err instanceof FrontendError) {
@@ -246,7 +245,7 @@
// Shove a new job into redis
console.info('Adding job with id %s to redis', collectionId);
try {
- redisClient.watch()
+ redisClient.watch();
redisClient.multi()
.rpush(
config.get('redis:job_queue_name'),
@@ -282,7 +281,7 @@
var collectionId = args.collection_id;
if (!collectionId) {
- throw new FrontendError('Collection ID must be given to query
render status.', 400)
+ throw new FrontendError('Collection ID must be given to query
render status.', 400);
}
console.debug('Attempting to obtain render status for collection id
%s', collectionId);
@@ -315,7 +314,7 @@
var collectionId = args.collection_id;
if (!collectionId) {
- throw new FrontendError('Collection ID must be given to obtain
download.', 400)
+ throw new FrontendError('Collection ID must be given to obtain
download.', 400);
}
try {
@@ -403,4 +402,4 @@
exports.init = init;
exports.start = startServer;
-exports.stop = stopServer;
\ No newline at end of file
+exports.stop = stopServer;
diff --git a/mw-collection-ocg.js b/mw-collection-ocg.js
index 86727aa..2eda8da 100755
--- a/mw-collection-ocg.js
+++ b/mw-collection-ocg.js
@@ -85,7 +85,7 @@
var i = 0;
/* --- Thread management --- */
- function gracefulShutdown() {
+ var gracefulShutdown = function () {
var stillAlive = 0;
respawnWorkers = false;
@@ -106,9 +106,9 @@
process.exit();
}
} while (stillAlive > 0);
- }
+ };
- function immediateShutdown() {
+ var immediateShutdown = function () {
respawnWorkers = false;
console.info('Shutting down immediately');
@@ -118,7 +118,8 @@
workers[id].destroy();
});
process.exit(1);
- }
+ };
+
process.on('SIGINT', gracefulShutdown);
process.on('SIGTERM', gracefulShutdown);
process.on('SIGHUP', immediateShutdown);
--
To view, visit https://gerrit.wikimedia.org/r/96534
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee9a0803feef793143d8da9e4d1dbcf885c096f6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection/OfflineContentGenerator
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
