Skip to content

More helpful errors #691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 20, 2017
Merged

More helpful errors #691

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ea0105
More useful error messages
phawxby Sep 28, 2017
e7e3cd4
Whoops
phawxby Sep 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions core/lib/data_loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@ function loadFile(dataFilesPath, fsDep) {
dataFile = _.head(dataFiles);

if (dataFile && fsDep.existsSync(path.resolve(dataFile))) {
return yaml.safeLoad(fsDep.readFileSync(path.resolve(dataFile), 'utf8'));
try {
return yaml.safeLoad(fsDep.readFileSync(path.resolve(dataFile), 'utf8'));
}
catch (err) {
throw new Error(`Error loading file: ${dataFile} - ${err.message}`);
}
}
}

Expand Down Expand Up @@ -48,8 +53,13 @@ function loadDataFromFolder(dataFilesPath, excludeFileNames, fsDep) {
let mergeObject = {};

dataFiles.forEach(function (filePath) {
let jsonData = yaml.safeLoad(fsDep.readFileSync(path.resolve(filePath), 'utf8'));
mergeObject = _.merge(mergeObject, jsonData);
try {
let jsonData = yaml.safeLoad(fsDep.readFileSync(path.resolve(filePath), 'utf8'));
mergeObject = _.merge(mergeObject, jsonData);
}
catch (err) {
throw new Error(`Error loading file: ${filePath} - ${err.message}`);
}
});

return mergeObject;
Expand Down