IT4Change/ohmyform
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed app configuration loading logic

Browse Source
This commit is contained in:
David Baldwynn 2015-07-27 13:53:52 -07:00
parent e552e03f81
commit 64913b8b03
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
config/config.js
View File

@ -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