Skip to content

Commit

Permalink
When a connection error occurs don't call connection.close() as the d…
Browse files Browse the repository at this point in the history 
…river always closes the connection itself when it transitions to STATE.FINAL.

Fix tests to handle this change and also be able read connectionConfig from a file similar to tedious module tests.
Also add test commands to package.json so it's easier to discover how to run unit tests.
  • Loading branch information
@ashelley
ashelley committed Oct 26, 2015
1 parent eb64ff6 commit 84cec97
Show file tree
Hide file tree
Showing 3 changed files with 95 additions and 25 deletions.
3 changes: 0 additions & 3 deletions lib/connection-pool.js
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,12 @@ function createConnection(pooled) {
self.log('connection closing because of error');

connection.removeListener('end', endHandler);
connection.close();

pooled.status = RETRY;
pooled.con = undefined;
if (pooled.timeout)
clearTimeout(pooled.timeout);

pooled.timeout = setTimeout(createConnection.bind(self, pooled), self.retryDelay);

self.emit('error', err);
};

Expand Down
2 changes: 1 addition & 1 deletion package.json
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Connection Pool for tedious.",
"main": "lib/connection-pool.js",
"scripts": {
"test": "test"
"test": "mocha test/naming.test.js && mocha test/connection-pool.test.js"
},
"repository": {
"type": "git",
Expand Down
115 changes: 94 additions & 21 deletions test/connection-pool.test.js
100644 → 100755
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
var assert = require('assert');
var Request = require('tedious').Request;
var fs = require('fs');
var ConnectionPool = require('../lib/connection-pool');

var connectionConfig = {
userName: 'test',
password: 'test',
server: 'dev1',
options: {
appName: 'pool-test',
database: 'test'
}
};
function getConfig() {
var config = JSON.parse(fs.readFileSync(process.env.HOME + '/.tedious/test-connection-pool.json', 'utf8')).config;
return config;
}

/* create a db user with the correct permissions:
CREATE DATABASE test
CREATE LOGIN test WITH PASSWORD=N'test', DEFAULT_DATABASE=test, CHECK_POLICY=OFF
Expand All @@ -36,7 +33,7 @@ describe('ConnectionPool', function () {
this.timeout(10000);

var poolConfig = {min: 2};
var pool = new ConnectionPool(poolConfig, connectionConfig);
var pool = new ConnectionPool(poolConfig, getConfig());

setTimeout(function() {
assert.equal(pool.connections.length, poolConfig.min);
Expand All @@ -48,7 +45,7 @@ describe('ConnectionPool', function () {
this.timeout(10000);

var poolConfig = {min: 0, idleTimeout: 10};
var pool = new ConnectionPool(poolConfig, connectionConfig);
var pool = new ConnectionPool(poolConfig, getConfig());

setTimeout(function() {
assert.equal(pool.connections.length, 0);
Expand Down Expand Up @@ -80,7 +77,7 @@ describe('ConnectionPool', function () {
this.timeout(10000);

var poolConfig = {min: 2, max: 5};
var pool = new ConnectionPool(poolConfig, connectionConfig);
var pool = new ConnectionPool(poolConfig, getConfig());

var count = 20;
var run = 0;
Expand Down Expand Up @@ -119,7 +116,7 @@ describe('ConnectionPool', function () {
this.timeout(10000);

var poolConfig = { min: 5, max: 1, idleTimeout: 10};
var pool = new ConnectionPool(poolConfig, connectionConfig);
var pool = new ConnectionPool(poolConfig, getConfig());

setTimeout(function() {
assert.equal(pool.connections.length, 1);
Expand Down Expand Up @@ -151,7 +148,7 @@ describe('ConnectionPool', function () {
this.timeout(10000);

var poolConfig = {max: 1, idleTimeout: 10};
var pool = new ConnectionPool(poolConfig, connectionConfig);
var pool = new ConnectionPool(poolConfig, getConfig());

setTimeout(function() {
assert.equal(pool.connections.length, 1);
Expand Down Expand Up @@ -199,7 +196,7 @@ describe('ConnectionPool', function () {

pool.on('error', function(err) {
assert(!!err);
pool.connectionConfig = connectionConfig;
pool.connectionConfig = getConfig();
});

function testConnected() {
Expand All @@ -221,7 +218,7 @@ describe('ConnectionPool', function () {
this.timeout(10000);

var poolConfig = {min: 1, max: 1, acquireTimeout: 2000};
var pool = new ConnectionPool(poolConfig, connectionConfig);
var pool = new ConnectionPool(poolConfig, getConfig());

pool.acquire(function(err, connection) {
assert(!err);
Expand All @@ -238,7 +235,7 @@ describe('ConnectionPool', function () {
it('idle timeout', function (done) {
this.timeout(10000);
var poolConfig = {min: 1, max: 5, idleTimeout: 100};
var pool = new ConnectionPool(poolConfig, connectionConfig);
var pool = new ConnectionPool(poolConfig, getConfig());

setTimeout(function() {
pool.acquire(function (err, connection) {
Expand All @@ -262,11 +259,15 @@ describe('ConnectionPool', function () {
it('lost connection handling', function (done) {
this.timeout(10000);
var poolConfig = {min: 1, max: 5};
var connectionConfig = getConfig();

connectionConfig.options = connectionConfig.options || {};
connectionConfig.options.requestTimeout = 5000;

var pool = new ConnectionPool(poolConfig, connectionConfig);

pool.on('error', function(err) {
assert(err && err.name === 'ConnectionError');
pool.drain(done);
});

//This simulates a lost connections by creating a job that kills the current session and then deletesthe job.
Expand All @@ -290,7 +291,9 @@ describe('ConnectionPool', function () {
'SELECT 42';

var request = new Request(command, function (err, rowCount) {
assert(false);
assert(err);
assert(err.code,'ETIMEOUT');
pool.drain(done);
});

request.on('row', function (columns) {
Expand All @@ -305,7 +308,7 @@ describe('ConnectionPool', function () {
this.timeout(10000);

var poolConfig = {max: 1};
var pool = new ConnectionPool(poolConfig, connectionConfig);
var pool = new ConnectionPool(poolConfig, getConfig());

var createRequest = function(query, value, callback) {
var request = new Request(query, function (err, rowCount) {
Expand Down Expand Up @@ -342,7 +345,7 @@ describe('ConnectionPool', function () {
this.timeout(10000);

var poolConfig = {min: 3};
var pool = new ConnectionPool(poolConfig, {});
var pool = new ConnectionPool(poolConfig, getConfig());

pool.acquire(function() { });

Expand All @@ -351,4 +354,74 @@ describe('ConnectionPool', function () {
pool.drain(done);
}, 4);
});

it('request callback should be called on socket error', function (done) {
this.timeout(10000);

var poolConfig = {min: 1};

var connectionConfig = getConfig();
connectionConfig.options = connectionConfig.options || {};
connectionConfig.options.requestTimeout = 60000;

var pool = new ConnectionPool(poolConfig, connectionConfig);

pool.acquire(function(err, conn) {
var request = new Request("WAITFOR 00:00:30", function(err) {
assert(err);
assert.equal(err.message, 'socket error');
pool.drain(done);
});
conn.execSql(request);
conn.socket.emit('error', new Error('socket error'));
});
pool.on('error', function(err) {
assert.equal(err.code, 'ESOCKET');
});
});

it('connection should still work after socket error', function (done) {
this.timeout(10000);

var poolConfig = {min: 1, max: 1};

var connectionConfig = getConfig();
connectionConfig.options = connectionConfig.options || {};
connectionConfig.options.requestTimeout = 60000;

var pool = new ConnectionPool(poolConfig, connectionConfig);

var createRequest = function(query, value, callback) {
var request = new Request(query, function (err, rowCount) {
assert.strictEqual(rowCount, 1);
callback();
});

request.on('row', function (columns) {
assert.strictEqual(columns[0].value, value);
});

return request;
};

pool.acquire(function(err, conn) {
var request = new Request("WAITFOR 00:00:30", function(err) {
assert(err);
assert.equal(err.message, 'socket error');
conn.release();
pool.acquire(function(err, conn) {
assert(!err);
conn.execSql(createRequest('SELECT 42', 42, function () {
pool.drain(done);
}));
});
});
conn.execSql(request);
conn.socket.emit('error', new Error('socket error'));
});
pool.on('error', function(err) {
assert.equal(err.code, 'ESOCKET');
});
});

});

0 comments on commit 84cec97

Please sign in to comment.