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

Add BoxError.toPlainObject

Browse Source
This commit is contained in:
Girish Ramakrishnan
2019-09-05 21:10:55 -07:00
parent 99e63ffc3f
commit a18a620847
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apptask.js
+6 -6
View File
@@ -530,8 +530,7 @@ function install(app, restoreConfig, progressCallback, callback) {
], function seriesDone(error) {
if (error) {
debugApp(app, 'error installing app: %s', error);
const appError = _.extend({ message: error.message, reason: error.reason }, error.details);
return updateApp(app, { installationState: apps.ISTATE_ERROR, error: appError }, callback.bind(null, error));
return updateApp(app, { installationState: apps.ISTATE_ERROR, error: error.toPlainObject ? error.toPlainObject() : error.message }, callback.bind(null, error));
}
callback(null);
});
@@ -553,7 +552,8 @@ function backup(app, progressCallback, callback) {
], function seriesDone(error) {
if (error) {
debugApp(app, 'error backing up app: %s', error);
return updateApp(app, { installationState: apps.ISTATE_INSTALLED, error: { message: error.message } }, callback.bind(null, error)); // return to installed state intentionally
// return to installed state intentionally
return updateApp(app, { installationState: apps.ISTATE_INSTALLED, error: error.toPlainObject ? error.toPlainObject() : error.message }, callback.bind(null, error));
}
callback(null);
});
@@ -635,7 +635,7 @@ function configure(app, oldConfig, progressCallback, callback) {
], function seriesDone(error) {
if (error) {
debugApp(app, 'error reconfiguring : %s', error);
return updateApp(app, { installationState: apps.ISTATE_ERROR, error: { message: error.message }}, callback.bind(null, error));
return updateApp(app, { installationState: apps.ISTATE_ERROR, error: error.toPlainObject ? error.toPlainObject() : error.message }, callback.bind(null, error));
}
callback(null);
});
@@ -744,7 +744,7 @@ function update(app, updateConfig, progressCallback, callback) {
updateApp(app, { installationState: apps.ISTATE_INSTALLED, error: null, health: null }, callback.bind(null, error));
} else if (error) {
debugApp(app, 'Error updating app: %s', error);
updateApp(app, { installationState: apps.ISTATE_ERROR, error: { message: error.message }, updateTime: new Date() }, callback.bind(null, error));
updateApp(app, { installationState: apps.ISTATE_ERROR, error: error.toPlainObject ? error.toPlainObject() : error.message, updateTime: new Date() }, callback.bind(null, error));
} else {
if (updateConfig.skipNotification) return callback();
@@ -797,7 +797,7 @@ function uninstall(app, progressCallback, callback) {
], function seriesDone(error) {
if (error) {
debugApp(app, 'error uninstalling app: %s', error);
return updateApp(app, { installationState: apps.ISTATE_ERROR, error: { message: error.message } }, callback.bind(null, error));
return updateApp(app, { installationState: apps.ISTATE_ERROR, error: error.toPlainObject ? error.toPlainObject() : error.message }, callback.bind(null, error));
}
callback(null);
});
src/boxerror.js
+6 -1
View File
@@ -3,7 +3,8 @@
'use strict';
const assert = require('assert'),
util = require('util');
util = require('util'),
_ = require('underscore');
exports = module.exports = BoxError;
@@ -36,3 +37,7 @@ BoxError.CONFLICT = 'Conflict';
BoxError.EXTERNAL_ERROR = 'External Error';
BoxError.INTERNAL_ERROR = 'Internal Error';
BoxError.NOT_FOUND = 'Not found';
BoxError.prototype.toPlainObject = function () {
return _.extend({}, { message: this.message, reason: this.reason }, this.details);
};