#18 reading db-config from DATABASE_URL or ini-file

unleash-server/lib/dbPool.js

@@ -6,17 +6,19 @@ var anyDB = require('any-db'),
 
 
 function createDbPool() {
-    if (nconf.argv().get('databaseini') !== undefined) {
+    // Use postgres db from DATABASE_URL if set
+    if (process.env.DATABASE_URL) {
+        logger.info('unleash started with DATABASE_URL');
+        return anyDB.createPool(process.env.DATABASE_URL);
+    }
+
+    // Finn specific way of delivering env variables
+    else if(nconf.argv().get('databaseini') !== undefined) {
         var databaseini = nconf.argv().get('databaseini');
-
         logger.info('unleash started with databaseini: ' + databaseini);
-
         var config = ini.parse(fs.readFileSync(databaseini, 'utf-8'));
-
         return anyDB.createPool(config.DATABASE_URL, {min: 2, max: 20});
     }
 }
 
-module.exports = {
+module.exports = createDbPool();
-    pool: createDbPool()
-};

unleash-server/lib/eventStore.js

@@ -1,5 +1,6 @@
 var Promise = require('bluebird'),
     util = require('util'),
+    dbPool = require('./dbPool'),
     EventEmitter = require('events').EventEmitter;
 
 function EventStore() {

unleash-server/package.json

@@ -40,6 +40,7 @@
         "nconf": "0.6.9",
         "pg": "^3.6.1",
         "any-db": "2.1.0",
+        "any-db-pool": "2.1.0",
         "any-db-postgres": "2.1.3"
     },
     "devDependencies": {