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

Simplify connection string

Browse source 
We're using `DATABASE_URL` environment variable anyway.
This commit is contained in:
Maciej Małecki 2014-04-04 02:37:11 +07:00
parent 4984fcb90a
commit e549764a66
2 changed files with 1 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
config/postgres.json
View file

@ -1,6 +0,0 @@
{
"user": "lamassu",
"pwd": "lamassu",
"host": "localhost",
"db": "lamassu"
}

9
lib/app.js
View file

@ -26,17 +26,10 @@ var app = express();
var fs = require('fs');
var LamassuConfig = require('lamassu-config');
var atm = require('lamassu-atm-protocol');
var format = require('util').format;
var conString, dbConfig, config;
if (process.env.DATABASE_URL) {
conString = process.env.DATABASE_URL;
}
else {
dbConfig = require('../config/postgres.json');
conString = format('postgres://%s:%s@%s/%s', dbConfig.user, dbConfig.pwd, dbConfig.host, dbConfig.db);
}
conString = process.env.DATABASE_URL || 'postgres://lamassu:lamassu@localhost/lamassu';
config = new LamassuConfig(conString);