From a2bc59721293bbc9504db06c0ee18a51429c54c6 Mon Sep 17 00:00:00 2001 From: Ruben Bridgewater Date: Wed, 22 Jul 2015 16:19:02 +0200 Subject: [PATCH] Add simicolons This is just a style change --- diff_multi_bench_output.js | 2 +- examples/extend.js | 2 +- examples/file.js | 6 +++--- examples/unix_socket.js | 4 +++- index.js | 10 +++++----- test/queue-test.js | 10 +++++----- test/test-unref.js | 16 +++++++++------- test/test.js | 20 ++++++++++---------- 8 files changed, 37 insertions(+), 33 deletions(-) diff --git a/diff_multi_bench_output.js b/diff_multi_bench_output.js index 23cb3ad..0aff103 100755 --- a/diff_multi_bench_output.js +++ b/diff_multi_bench_output.js @@ -49,7 +49,7 @@ before_lines.forEach(function(b, i) { var isNaN = !num && num !== 0; return !isNaN; }); - if (ops.length != 2) return + if (ops.length != 2) return; var delta = ops[1] - ops[0]; var pct = ((delta / ops[0]) * 100).toPrecision(3); diff --git a/examples/extend.js b/examples/extend.js index b3a10fa..2256608 100644 --- a/examples/extend.js +++ b/examples/extend.js @@ -16,7 +16,7 @@ redis.RedisClient.prototype.parse_info = function (callback) { obj[parts[0]] = parts[1]; } }); - callback(obj) + callback(obj); }); }; diff --git a/examples/file.js b/examples/file.js index 9197019..620b0a1 100644 --- a/examples/file.js +++ b/examples/file.js @@ -13,9 +13,9 @@ var redis = require("redis"), // Read a file from fs, store it in Redis, get it back from Redis, write it back to fs. fs.readFile(filename, function (err, data) { - if (err) throw err + if (err) throw err; console.log("Read " + data.length + " bytes from filesystem."); - + client.set(filename, data, redis.print); // set entire file client.get(filename, function (err, reply) { // get entire file if (err) { @@ -23,7 +23,7 @@ fs.readFile(filename, function (err, data) { } else { fs.writeFile("duplicate_" + filename, reply, function (err) { if (err) { - console.log("Error on write: " + err) + console.log("Error on write: " + err); } else { console.log("File written."); } diff --git a/examples/unix_socket.js b/examples/unix_socket.js index 4a5e0bb..460b78e 100644 --- a/examples/unix_socket.js +++ b/examples/unix_socket.js @@ -1,9 +1,11 @@ +'use strict'; + var redis = require("redis"), client = redis.createClient("/tmp/redis.sock"), profiler = require("v8-profiler"); client.on("connect", function () { - console.log("Got Unix socket connection.") + console.log("Got Unix socket connection."); }); client.on("error", function (err) { diff --git a/index.js b/index.js index 6c70a25..bdc2889 100644 --- a/index.js +++ b/index.js @@ -17,10 +17,10 @@ var net = require("net"), // can set this to true to enable for all connections exports.debug_mode = false; -var arraySlice = Array.prototype.slice +var arraySlice = Array.prototype.slice; function trace() { if (!exports.debug_mode) return; - console.log.apply(null, arraySlice.call(arguments)) + console.log.apply(null, arraySlice.call(arguments)); } // hiredis might not be installed @@ -141,7 +141,7 @@ RedisClient.prototype.unref = function () { trace("Not connected yet, will unref later"); this.once("connect", function () { this.unref(); - }) + }); } }; @@ -219,7 +219,7 @@ RedisClient.prototype.do_auth = function () { }, 2000); // TODO - magic number alert return; } else if (err.toString().match("no password is set")) { - console.log("Warning: Redis server does not require a password, but a password was supplied.") + console.log("Warning: Redis server does not require a password, but a password was supplied."); err = null; res = "OK"; } else { @@ -1265,7 +1265,7 @@ var createClient_unix = function(path, options){ redis_client.address = path; return redis_client; -} +}; var createClient_tcp = function (port_arg, host_arg, options) { var cnxOptions = { diff --git a/test/queue-test.js b/test/queue-test.js index 4811eca..dbc9771 100644 --- a/test/queue-test.js +++ b/test/queue-test.js @@ -11,12 +11,12 @@ module.exports = function (tests, next) { q.push(3); assert.equal(q.length, 2); return next(); - } + }; tests.shift = function () { assert.equal(q.shift(), 'a'); return next(); - } + }; tests.forEach = function () { q.forEach(function (v) { @@ -24,7 +24,7 @@ module.exports = function (tests, next) { }); return next(); - } + }; tests.forEachWithScope = function () { q.forEach(function (v) { @@ -33,5 +33,5 @@ module.exports = function (tests, next) { }, {foo: 'bar'}); return next(); - } -} + }; +}; diff --git a/test/test-unref.js b/test/test-unref.js index d66d77c..c7dc930 100644 --- a/test/test-unref.js +++ b/test/test-unref.js @@ -1,12 +1,14 @@ -var redis = require("../") +'use strict'; + +var redis = require("../"); //redis.debug_mode = true var PORT = process.argv[2] || 6379; var HOST = process.argv[3] || '127.0.0.1'; -var c = redis.createClient(PORT, HOST) -c.unref() +var c = redis.createClient(PORT, HOST); +c.unref(); c.info(function (err, reply) { - if (err) process.exit(-1) - if (!reply.length) process.exit(-1) - process.stdout.write(reply.length.toString()) -}) + if (err) process.exit(-1); + if (!reply.length) process.exit(-1); + process.stdout.write(reply.length.toString()); +}); diff --git a/test/test.js b/test/test.js index 325ea13..7bb2966 100644 --- a/test/test.js +++ b/test/test.js @@ -137,7 +137,7 @@ tests.IPV4 = function () { console.error("client: " + err.stack); process.exit(); }); -} +}; tests.IPV6 = function () { if (!server_version_at_least(client, [2, 8, 0])) { @@ -163,7 +163,7 @@ tests.IPV6 = function () { console.error("client: " + err.stack); process.exit(); }); -} +}; tests.UNIX_SOCKET = function () { var unixClient = redis.createClient('/tmp/redis.sock', { parser: parser }); @@ -189,7 +189,7 @@ tests.UNIX_SOCKET = function () { console.error("client: " + err.stack); process.exit(); }); -} +}; tests.FLUSHDB = function () { var name = "FLUSHDB"; @@ -1543,7 +1543,7 @@ tests.HGETALL_MESSAGE = function () { client.hgetall("msg_test", function (err, obj) { assert.strictEqual(null, err, name + " result sent back unexpected error: " + err); assert.strictEqual(1, Object.keys(obj).length, name); - assert.strictEqual(obj.message, "hello") + assert.strictEqual(obj.message, "hello"); next(name); }); }; @@ -2178,8 +2178,8 @@ tests.ENABLE_OFFLINE_QUEUE_FALSE = function () { // ignore, see above }); assert.throws(function () { - cli.set(name, name) - }) + cli.set(name, name); + }); assert.doesNotThrow(function () { cli.set(name, name, function (err) { // should callback with an error @@ -2205,7 +2205,7 @@ tests.SLOWLOG = function () { client.config("set", "slowlog-log-slower-than", 10000, require_string("OK", name)); next(name); }); -} +}; tests.DOMAIN = function () { var name = "DOMAIN"; @@ -2323,9 +2323,9 @@ tests.unref = function () { var external = fork("./test/test-unref.js"); var done = false; external.on("close", function (code) { - assert(code == 0, "test-unref.js failed"); + assert(code === 0, "test-unref.js failed"); done = true; - }) + }); setTimeout(function () { if (!done) { external.kill(); @@ -2336,7 +2336,7 @@ tests.unref = function () { }; // starting to split tests into multiple files. -require('./queue-test')(tests, next) +require('./queue-test')(tests, next); all_tests = Object.keys(tests); all_start = new Date();