cartodb/node-postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't emit error events parsed out of data stream

Browse Source
This commit is contained in:
Oliver Salzburg 2015-08-24 16:18:43 +02:00
parent 715e5009dd
commit e5a63ab58d
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/pool.js
View File

@ -23,9 +23,14 @@ var pools = {
log: clientConfig.poolLog || defaults.poolLog, log: clientConfig.poolLog || defaults.poolLog,
create: function(cb) { create: function(cb) {
var client = new pools.Client(clientConfig); var client = new pools.Client(clientConfig);
// Ignore errors on pooled clients until they are connected.
client.on('error', Function.prototype);
client.connect(function(err) { client.connect(function(err) {
if(err) return cb(err, null); if(err) return cb(err, null);
// Remove the noop error handler after a connection has been established.
client.removeListener('error', Function.prototype);
//handle connected client background errors by emitting event //handle connected client background errors by emitting event
//via the pg object and then removing errored client from the pool //via the pg object and then removing errored client from the pool
client.on('error', function(e) { client.on('error', function(e) {

5
test/unit/pool/basic-tests.js
View File

@ -121,9 +121,10 @@ test('pool with connection error on connection', function() {
process.nextTick(function() { process.nextTick(function() {
cb(new Error('Could not connect')); cb(new Error('Could not connect'));
}); });
} },
on: Function.prototype
};
}; };
}
test('two parameters', function() { test('two parameters', function() {
var p = pools.getOrCreate(poolId++); var p = pools.getOrCreate(poolId++);
p.connect(assert.calls(function(err, client) { p.connect(assert.calls(function(err, client) {