mirror of
https://github.com/seejohnrun/haste-server.git
synced 2024-11-22 04:31:21 +00:00
Switch to using pg.Pool
This commit is contained in:
parent
9a692ed652
commit
f147acb51c
1 changed files with 11 additions and 14 deletions
|
@ -1,14 +1,16 @@
|
||||||
/*global require,module,process*/
|
/*global require,module,process*/
|
||||||
|
|
||||||
var winston = require('winston');
|
var winston = require('winston');
|
||||||
const {Client} = require('pg');
|
const {Pool} = require('pg');
|
||||||
|
|
||||||
// create table entries (id serial primary key, key varchar(255) not null, value text not null, expiration int, unique(key));
|
// create table entries (id serial primary key, key varchar(255) not null, value text not null, expiration int, unique(key));
|
||||||
|
|
||||||
// A postgres document store
|
// A postgres document store
|
||||||
var PostgresDocumentStore = function (options) {
|
var PostgresDocumentStore = function (options) {
|
||||||
this.expireJS = options.expire;
|
this.expireJS = options.expire;
|
||||||
this.connectionUrl = process.env.DATABASE_URL || options.connectionUrl;
|
|
||||||
|
const connectionString = process.env.DATABASE_URL || options.connectionUrl;
|
||||||
|
this.pool = new Pool({connectionString});
|
||||||
};
|
};
|
||||||
|
|
||||||
PostgresDocumentStore.prototype = {
|
PostgresDocumentStore.prototype = {
|
||||||
|
@ -64,20 +66,15 @@ PostgresDocumentStore.prototype = {
|
||||||
|
|
||||||
// A connection wrapper
|
// A connection wrapper
|
||||||
safeConnect: function (callback) {
|
safeConnect: function (callback) {
|
||||||
const client = new Client({connectionString: this.connectionUrl});
|
this.pool.connect((err, client, done) => {
|
||||||
const connectionPromise = client.connect();
|
if (err) {
|
||||||
|
|
||||||
const done = () => {};
|
|
||||||
|
|
||||||
connectionPromise.then(() => {
|
|
||||||
callback(undefined, client, done);
|
|
||||||
}).catch((error) => {
|
|
||||||
console.log(error);
|
|
||||||
winston.error('error connecting to postgres', {error});
|
winston.error('error connecting to postgres', {error});
|
||||||
callback(error);
|
callback(error);
|
||||||
|
} else {
|
||||||
|
callback(undefined, client, done);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
module.exports = PostgresDocumentStore;
|
module.exports = PostgresDocumentStore;
|
||||||
|
|
Loading…
Reference in a new issue