jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

do not re-generate DATABASE_ERROR

Browse Source
This commit is contained in:
Girish Ramakrishnan
2019-10-24 20:31:45 -07:00
parent c3a5360a88
commit 02339d503c
9 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps.js
+4 -9
View File
@@ -1101,8 +1101,7 @@ function setCertificate(appId, bundle, auditSource, callback) {
if (error) return callback(error);
domains.get(app.domain, function (error, domainObject) {
if (error && error.reason === BoxError.NOT_FOUND) return callback(new BoxError(BoxError.NOT_FOUND, 'No such domain'));
if (error) return callback(new BoxError(BoxError.DATABASE_ERROR, 'Could not get domain info:' + error.message));
if (error) return callback(error);
if (bundle.cert && bundle.key) {
error = reverseProxy.validateCertificate(app.location, domainObject, { cert: bundle.cert, key: bundle.key });
@@ -1406,9 +1405,7 @@ function restore(appId, data, auditSource, callback) {
var func = data.backupId ? backups.get.bind(null, data.backupId) : function (next) { return next(null, { manifest: app.manifest }); };
func(function (error, backupInfo) {
if (error && error.reason === BoxError.NOT_FOUND) return callback(new BoxError(BoxError.EXTERNAL_ERROR, error.message));
if (error && error.reason === BoxError.EXTERNAL_ERROR) return callback(new BoxError(BoxError.EXTERNAL_ERROR, error.message));
if (error) return callback(new BoxError(BoxError.DATABASE_ERROR, error));
if (error) return callback(error);
if (!backupInfo.manifest) callback(new BoxError(BoxError.EXTERNAL_ERROR, 'Could not get restore manifest'));
@@ -1516,9 +1513,7 @@ function clone(appId, data, user, auditSource, callback) {
if (error) return callback(error);
backups.get(backupId, function (error, backupInfo) {
if (error && error.reason === BoxError.EXTERNAL_ERROR) return callback(new BoxError(BoxError.EXTERNAL_ERROR, error.message));
if (error && error.reason === BoxError.NOT_FOUND) return callback(new BoxError(BoxError.EXTERNAL_ERROR, 'Backup not found'));
if (error) return callback(new BoxError(BoxError.DATABASE_ERROR, error));
if (error) return callback(error);
if (!backupInfo.manifest) callback(new BoxError(BoxError.EXTERNAL_ERROR, 'Could not get restore config'));
@@ -1829,7 +1824,7 @@ function listBackups(page, perPage, appId, callback) {
assert.strictEqual(typeof callback, 'function');
appdb.exists(appId, function (error, exists) {
if (error) return callback(new BoxError(BoxError.DATABASE_ERROR, error));
if (error) return callback(error);
if (!exists) return callback(new BoxError(BoxError.NOT_FOUND));
backups.getByAppIdPaged(page, perPage, appId, function (error, results) {