TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-23 22:11:09 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2071 from samccone/sjs/show-error-on-import-failure

Browse Source 
Show parse error message during a failed import
This commit is contained in:
Hannah Wolfe 2014-02-19 20:56:01 +00:00
commit bee5bde491
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/server/api/db.js
View File

@ -8,8 +8,8 @@ var dataExport = require('../data/export'),
_ = require('lodash'),
schema = require('../data/schema').tables,
config = require('../config'),
errors = require('../../server/errorHandling'),
api = {},
db;
api.notifications = require('./notifications');
@ -76,7 +76,8 @@ db = {
try {
importData = JSON.parse(fileContents);
} catch (e) {
return when.reject(new Error("Failed to parse the import file"));
errors.logError(e, "API DB import content", "check that the import file is valid JSON.");
return when.reject(new Error("Failed to parse the import JSON file"));
}
if (!importData.meta || !importData.meta.version) {
@ -133,4 +134,4 @@ db = {
}
};
module.exports = db;
module.exports = db;