redis/node-redis
1
0
Fork 0
mirror of https://github.com/redis/node-redis.git synced 2025-08-06 02:15:48 +03:00
Code Activity

Fix an issue with .multi after a reconnect on node 0.10

Browse Source 
Add .path to .createClient options object for unix sockets
This commit is contained in:
Ruben Bridgewater
2015-10-29 23:21:08 +01:00
parent c3502c799f
commit d454e4025b
6 changed files with 113 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
test/commands/multi.spec.js
View File

@@ -65,6 +65,31 @@ describe("The 'multi' method", function () {
multi1.get('m1');
multi1.exec(done);
});
it("executes a pipelined multi properly after a reconnect in combination with the offline queue", function (done) {
client.once('ready', function () {
client.stream.destroy();
var called = false;
var multi1 = client.multi();
multi1.set("m1", "123");
multi1.get('m1');
multi1.exec(function (err, res) {
assert(!err);
called = true;
});
client.once('ready', function () {
var multi1 = client.multi();
multi1.set("m2", "456");
multi1.get('m2');
multi1.exec(function (err, res) {
assert(called);
assert(!err);
assert.strictEqual(res, '456');
done();
});
});
});
});
});
describe("when connection is broken", function () {

41
test/connection.spec.js
View File

@@ -4,7 +4,6 @@ var assert = require("assert");
var config = require("./lib/config");
var helper = require('./helper');
var redis = config.redis;
var net = require('net');
describe("connection tests", function () {
helper.allTests(function(parser, ip, args) {
@@ -68,7 +67,7 @@ describe("connection tests", function () {
client.on('error', function(err) {
if (/Redis connection in broken state: connection timeout.*?exceeded./.test(err.message)) {
setTimeout(function () {
assert(time === connect_timeout);
assert.strictEqual(time, connect_timeout);
done();
}, 500);
}
@@ -133,7 +132,9 @@ describe("connection tests", function () {
host: '192.168.74.167',
connect_timeout: connect_timeout
});
assert(client.stream._events.timeout);
process.nextTick(function() {
assert(client.stream._events.timeout);
});
assert.strictEqual(client.address, '192.168.74.167:6379');
var time = Date.now();
@@ -153,7 +154,9 @@ describe("connection tests", function () {
parser: parser,
host: '192.168.74.167'
});
assert(client.stream._events.timeout === undefined);
process.nextTick(function() {
assert.strictEqual(client.stream._events.timeout, undefined);
});
});
it("clears the socket timeout after a connection has been established", function (done) {
@@ -161,10 +164,12 @@ describe("connection tests", function () {
parser: parser,
connect_timeout: 1000
});
assert.strictEqual(client.stream._idleTimeout, 1000);
process.nextTick(function() {
assert.strictEqual(client.stream._idleTimeout, 1000);
});
client.on('connect', function () {
assert.strictEqual(client.stream._idleTimeout, -1);
assert(client.stream._events.timeout === undefined);
assert.strictEqual(client.stream._events.timeout, undefined);
done();
});
});
@@ -182,6 +187,22 @@ describe("connection tests", function () {
});
});
it("connect with path provided in the options object", function (done) {
client = redis.createClient({
path: '/tmp/redis.sock',
parser: parser,
connect_timeout: 1000
});
var end = helper.callFuncAfter(done, 2);
client.once('ready', function() {
end();
});
client.set('foo', 'bar', end);
});
it("connects correctly with args", function (done) {
client = redis.createClient.apply(redis.createClient, args);
client.on("error", done);
@@ -247,13 +268,7 @@ describe("connection tests", function () {
it("works with missing options object for new redis instances", function () {
// This is needed for libraries that have their own createClient function like fakeredis
var cnxOptions = {
port : 6379,
host : '127.0.0.1',
family : ip === 'IPv6' ? 6 : 4
};
var net_client = net.createConnection(cnxOptions);
client = new redis.RedisClient(net_client);
client = new redis.RedisClient({ on: function () {}});
});
it("throws on strange connection info", function () {

2
test/helper.js
View File

@@ -161,7 +161,7 @@ module.exports = {
},
killConnection: function (client) {
// Change the connection option to a non existing one and destroy the stream
client.connectionOption = {
client.connection_option = {
port: 65535,
host: '127.0.0.1',
family: 4