Skip to content

Commit

Permalink
fix(package): upgrade common-env
Browse files Browse the repository at this point in the history
  • Loading branch information
FGRibreau committed Jun 11, 2015
1 parent 9950578 commit 1524a10
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
7 changes: 4 additions & 3 deletions lib/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ var KEY_REGEX = /^[a-f0-9]{24}$/i;
module.exports = function (log, DISPLAY_LOG) {
assert(_.isObject(log));

var commonEnv = require('common-env');
commonEnv.DISPLAY_LOG = DISPLAY_LOG !== false;
var commonEnv = require('common-env/withLogger');
var DEFAULT_REDIS_URI = 'redis://127.0.0.1:6379';
var DEFAULT_CONFIG_PATH = path.resolve(__dirname, '../etc/redsmin.json');

Expand Down Expand Up @@ -79,7 +78,9 @@ module.exports = function (log, DISPLAY_LOG) {
}

function Config(jsonFilename) {
var envConfig = commonEnv(log).getOrElseAll({
var envConfig = commonEnv(DISPLAY_LOG ? log : {
info: _.noop
}).getOrElseAll({
debug: false,
config_file: DEFAULT_CONFIG_PATH,

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
],
"dependencies": {
"backoff": "^2.4.1",
"common-env": "2.*.*",
"common-env": "4.*.*",
"daemonize2": "~0.4.0-rc.5",
"lodash": "^3.6.0",
"winston": "1.*.*"
Expand Down

0 comments on commit 1524a10

Please sign in to comment.