Skip to content

Commit

Permalink
FIX: Recursively merge common config and local config
Browse files Browse the repository at this point in the history
  • Loading branch information
Alan Cohen committed Feb 8, 2016
1 parent 2ada815 commit ac3b952
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions lib/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ function getEnv (prefix, name) {

return process.env[envVar.toUpperCase().replace(/-/g, '_')]
}

/**
* Parse the server configuration settings from the environment.
*/
Expand Down Expand Up @@ -179,7 +178,7 @@ function loadConfig (prefix, localConfig) {

const commonConfig = Immutable.fromJS({server, db, keys})

return commonConfig.merge(localConfig || {})
return commonConfig.mergeDeep(localConfig || {})
}

module.exports = {
Expand Down

0 comments on commit ac3b952

Please sign in to comment.