lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

migration auto-connect to postgres

Browse source
This commit is contained in:
Josh Harvey 2014-12-02 00:36:48 -05:00
parent bbc22b2d8b
commit 88ec5146f5
1 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

22
migrations/db.js
View file

@ -1,10 +1,17 @@
'use strict'; 'use strict';
var fs = require('fs');
var pg = require('pg'); var pg = require('pg');
var async = require('async'); var async = require('async');
// TODO: generalize var conString;
var conString = 'psql://lamassu:lamassu@localhost/lamassu'; try {
conString = process.env.DATABASE_URL ||
JSON.parse(fs.readFileSync('/etc/lamassu.json')).postgresql;
}
catch (ex) {
conString = 'psql://lamassu:lamassu@localhost/lamassu';
}
exports.query = function query(sql, cb) { exports.query = function query(sql, cb) {
exports.multi([sql], cb); exports.multi([sql], cb);
@ -12,7 +19,11 @@ exports.query = function query(sql, cb) {
exports.silentQuery = function query(sql, cb) { exports.silentQuery = function query(sql, cb) {
pg.connect(conString, function(err, client, done) { pg.connect(conString, function(err, client, done) {
if (err) return cb(err); if (err) {
console.log(err.message);
return cb(err);
}
client.query(sql, function(err) { client.query(sql, function(err) {
done(true); done(true);
cb(err); cb(err);
@ -22,7 +33,10 @@ exports.silentQuery = function query(sql, cb) {
exports.multi = function multi(sqls, cb) { exports.multi = function multi(sqls, cb) {
pg.connect(conString, function(err, client, done) { pg.connect(conString, function(err, client, done) {
if (err) return cb(err); if (err) {
console.log(err.message);
return cb(err);
}
async.eachSeries(sqls, client.query.bind(client), function(err) { async.eachSeries(sqls, client.query.bind(client), function(err) {
done(true); done(true);