Mark import errors as app errors

This commit is contained in:
Girish Ramakrishnan
2018-11-11 10:35:26 -08:00
parent 1766c3f6d6
commit a3a22604ba
2 changed files with 8 additions and 3 deletions

View File

@@ -325,7 +325,12 @@ function importDatabase(addon, callback) {
async.series([
KNOWN_ADDONS[addon].setup.bind(null, app, app.manifest.addons[addon]),
KNOWN_ADDONS[addon].restore.bind(null, app, app.manifest.addons[addon])
], iteratorCallback);
], function (error) {
if (!error) return iteratorCallback();
debug(`importDatabase: Error importing ${addon} of app ${app.id}. Marking as errored`, error);
appdb.update(app.id, { installationState: appdb.ISTATE_ERROR, installationProgress: error.message }, iteratorCallback);
});
}, callback);
});
}
@@ -1063,7 +1068,6 @@ function startMongodb(existingInfra, callback) {
const cloudronToken = hat(8 * 128);
const memoryLimit = (1 + Math.round(os.totalmem()/(1024*1024*1024)/4)) * 200;
const upgrading = existingInfra.version !== 'none' && requiresUpgrade(existingInfra.images.mongodb.tag, tag);
if (upgrading) {