Skip to content

Commit

Permalink
Better support no-config when loading from file
Browse files Browse the repository at this point in the history
We should still error if given a 5xx with an empty body.
  • Loading branch information
dbkr committed Nov 3, 2016
1 parent c1469f4 commit cfe63fa
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions src/vector/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -179,12 +179,15 @@ function getConfig() {
if (err || response.status < 200 || response.status >= 300) {
// Lack of a config isn't an error, we should
// just use the defaults.
// Also treat a blank config as no config because
// we don't get 404s from file: URIs so this is the
// only way we can not fail if the file doesn't exist
// when loading from a file:// URI.
if (( response && response.status == 404) || body == '') {
deferred.resolve({});
// Also treat a blank config as no config, assuming
// the status code is 0, because we don't get 404s
// from file: URIs so this is the only way we can
// not fail if the file doesn't exist when loading
// from a file:// URI.
if (response) {
if (response.status == 404 || (response.status == 0 && body == '')) {
deferred.resolve({});
}
}
deferred.reject({err: err, response: response});
return;
Expand Down

0 comments on commit cfe63fa

Please sign in to comment.