beenull/tellform
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fixed sessions error

Browse source
This commit is contained in:
David Baldwynn 2015-07-27 14:08:36 -07:00
parent d91f8a2ef6
commit f50ddc7b39
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
config/config.js
View file

@ -12,17 +12,17 @@ var _ = require('lodash'),
/** /**
* Load app configurations * Load app configurations
*/ */
if( fs.existsSync('./env/api_keys.js') ){ var exports = _.extend(
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/all'),
require('./env/' + process.env.NODE_ENV) || {} require('./env/' + process.env.NODE_ENV) || {}
); );
if( fs.existsSync('./env/api_keys.js') ){
module.exports = _.merge(
exports,
require('./env/api_keys') || {}
);
}else {
module.exports = exports;
} }