status-im
/
burnchart
mirror of https://github.com/status-im/burnchart.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

better handling of missing config; closes #22

This commit is contained in:
Radek Stepan 2013-10-01 11:12:48 +01:00
parent fc08c91fac
commit b9ecb4db41
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/build.js
View File

@ -28116,7 +28116,9 @@ module.exports = function(cb) {
wait = true; wait = true;
return request.config(function(err, result) { return request.config(function(err, result) {
var field, k, v, validator; var field, k, v, validator;
config = (err ? {} : result); if (err || !_.isObject(result)) {
config = {};
}
for (k in defaults) { for (k in defaults) {
v = defaults[k]; v = defaults[k];
if (config[k] == null) { if (config[k] == null) {

2
src/modules/config.coffee
View File

@ -44,7 +44,7 @@ module.exports = (cb) ->
# Make the request. # Make the request.
request.config (err, result) -> request.config (err, result) ->
# We do not strictly require config files. # We do not strictly require config files.
config = ( if err then { } else result ) config = {} if err or not _.isObject result
# Tack on defaults? # Tack on defaults?
( config[k] ?= v for k, v of defaults ) ( config[k] ?= v for k, v of defaults )