From 64913b8b0343007463cd2b6af8dddfc9b5a1be33 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Mon, 27 Jul 2015 13:53:52 -0700 Subject: [PATCH] fixed app configuration loading logic --- config/config.js | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/config/config.js b/config/config.js index 58c76cc6..b578d716 100755 --- a/config/config.js +++ b/config/config.js @@ -6,16 +6,25 @@ var _ = require('lodash'), glob = require('glob'), bowerFiles = require('main-bower-files'), - path = require('path'); + path = require('path'), + fs = require('fs'); /** * Load app configurations */ -module.exports = _.extend( - require('./env/all'), - require('./env/' + process.env.NODE_ENV) || {}, - require('./env/api_keys.js') || {} -); +if( fs.existsSync('./env/api_keys.js') ){ + module.exports = _.extend( + require('./env/all'), + require('./env/' + process.env.NODE_ENV) || {}, + require('./env/api_keys') || {} + ); +}else { + module.exports = _.extend( + require('./env/all'), + require('./env/' + process.env.NODE_ENV) || {} + ); +} + /** * Get files by glob patterns