Mwalker has submitted this change and it was merged.
Change subject: Fix jshint errors
......................................................................
Fix jshint errors
Change-Id: Iee9a0803feef793143d8da9e4d1dbcf885c096f6
---
A .jshintignore
A .jshintrc
M lib/RedisWrapper.js
M lib/backend.js
M lib/frontend.js
M mw-collection-ocg.js
6 files changed, 59 insertions(+), 20 deletions(-)
Approvals:
Mwalker: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.jshintignore b/.jshintignore
new file mode 100644
index 0000000..3c3629e
--- /dev/null
+++ b/.jshintignore
@@ -0,0 +1 @@
+node_modules
diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 0000000..487abd5
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,33 @@
+{
+ "predef": [
+ "ve",
+
+ "setImmediate",
+
+ "QUnit"
+ ],
+
+ "bitwise": true,
+ "curly": true,
+ "eqeqeq": true,
+ "immed": true,
+ "latedef": "nofunc",
+ "newcap": true,
+ "noarg": true,
+ "noempty": true,
+ "nonew": true,
+ "regexp": false,
+ "undef": true,
+ "strict": false,
+ "trailing": true,
+ "unused":"vars",
+
+ "smarttabs": true,
+ "multistr": true,
+
+ "node": true,
+
+ "nomen": false,
+ "loopfunc": true
+ //"onevar": true
+}
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..4b9112f 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);
@@ -97,7 +97,7 @@
});
}
function newItemFromQueue(err, obj) {
- var tempMetabook;
+ var tempMetabook, jobDetails;
if (err) {
console.error('Error picking up job status from queue (will
kill myself): %s', err);
@@ -129,6 +129,7 @@
}
function runBundler(jobDetails, metabookPath) {
+ var child;
var bundle = path.join(config.get('backend:temp_dir'),
jobDetails.collectionId + '.zip');
// TODO: Don't do this if we have a cached bundle
diff --git a/lib/frontend.js b/lib/frontend.js
index 3ad6ecd..d0c283c 100644
--- a/lib/frontend.js
+++ b/lib/frontend.js
@@ -27,6 +27,7 @@
var http = require('http');
var mime = require('mime');
var url = require('url');
+var util = require('util');
var jd = require('./JobDetails.js');
var Redis = require('./RedisWrapper.js');
@@ -63,7 +64,7 @@
var loop = false;
redisClient.on('closed', function() {
- if (loop == false) {
+ if (!loop) {
loop = true;
console.error('Redis died!?');
stopServer(process.exit);
@@ -180,7 +181,6 @@
break;
default:
throw new FrontendError('Unrecognized command',
400);
- break;
}
} catch(err) {
if (err instanceof FrontendError) {
@@ -240,13 +240,13 @@
if (!forceRender) {
// TODO: Check to see if we already have a copy of the rendered
content somewhere
// and / or if the job is already in redis!
+ /* jshint noempty: false */
}
if (!isCached || forceRender) {
// Shove a new job into redis
console.info('Adding job with id %s to redis', collectionId);
try {
- redisClient.watch()
redisClient.multi()
.rpush(
config.get('redis:job_queue_name'),
@@ -262,7 +262,7 @@
language
))
)
- .exec(function(err, replies) { if (err) { throw
err; } });
+ .exec(function(err) { if (err) { throw err; }
});
} catch (err) {
console.error('Job insertion into redis failed for job
%s with error: %s', collectionId, err);
throw new FrontendError('Job insertion failed (redis
failure?)', 500);
@@ -282,7 +282,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);
@@ -291,6 +291,7 @@
config.get('redis:status_set_name'),
collectionId,
function(err, result) {
+ var obj;
if (err) {
console.err('Redis error whilst
fetching id %s: %s', collectionId, err);
response.writeHead(500, 'Could not
fetch key from redis (internal error)');
@@ -315,7 +316,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 {
@@ -323,6 +324,7 @@
config.get('redis:status_set_name'),
collectionId,
function(err, result) {
+ var obj;
if (err) {
console.err('Redis error whilst
fetching id %s: %s', collectionId, err);
response.writeHead(500, 'Could not
fetch key from redis (internal error)');
@@ -363,7 +365,7 @@
* @returns string
*/
function createCollectionId(writer, metabookObj) {
- collectionId = crypto.createHash('sha1');
+ var collectionId = crypto.createHash('sha1');
collectionId.update(writer);
collectionId.update(metabookObj.title || '');
collectionId.update(metabookObj.subtitle || '');
@@ -395,12 +397,12 @@
* @param code
* @constructor
*/
-var FrontendError = function( message, code ) {
+function FrontendError( message, code ) {
this.message = message;
this.code = code || 500;
-};
-FrontendError.prototype = Error.prototype;
+}
+util.inherits(FrontendError, Error);
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..f5ca72e 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 gracefulShutdown() {
var stillAlive = 0;
respawnWorkers = false;
@@ -106,9 +106,9 @@
process.exit();
}
} while (stillAlive > 0);
- }
+ };
- function immediateShutdown() {
+ var immediateShutdown = function immediateShutdown() {
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: merged
Gerrit-Change-Id: Iee9a0803feef793143d8da9e4d1dbcf885c096f6
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/Collection/OfflineContentGenerator
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>
Gerrit-Reviewer: Cscott <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Mwalker <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
