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

Remove addons dep from cloudron.js

Browse Source
This commit is contained in:
Girish Ramakrishnan
2015-03-26 18:51:34 -07:00
parent fe1523a092
commit 517e6737fb
2 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apptask.js
+7 -1
View File
@@ -695,6 +695,9 @@ function restore(app, callback) {
updateApp.bind(null, app, { installationProgress: 'Downloading image' }),
downloadImage.bind(null, app),
updateApp.bind(null, app, { installationProgress: 'Restoring addons' }),
addons.restoreAddons.bind(null, app),
// setup addons
updateApp.bind(null, app, { installationProgress: 'Setting up addons' }),
addons.updateAddons.bind(null, app, oldManifest),
@@ -802,7 +805,10 @@ function update(app, callback) {
updateApp.bind(null, app, { installationProgress: 'Deleting container' }),
deleteContainer.bind(null, app),
updateApp.bind(null, app, { installationProgress: 'Backing up' }),
updateApp.bind(null, app, { installationProgress: 'Backing up addons' }),
addons.backupAddons.bind(null, app),
updateApp.bind(null, app, { installationProgress: 'Uploading backup' }),
cloudron.backupApp.bind(null, app),
updateApp.bind(null, app, { installationProgress: 'Verify manifest' }),
src/cloudron.js
+9 -18
View File
@@ -21,8 +21,7 @@ exports = module.exports = {
getIp: getIp
};
var addons = require('./addons.js'),
apps = require('./apps.js'),
var apps = require('./apps.js'),
assert = require('assert'),
async = require('async'),
config = require('../config.js'),
@@ -200,32 +199,24 @@ function restoreApp(app, callback) {
execFile(SUDO, [ RESTORE_APP_CMD, app.id, result.url, result.backupKey ], { }, function (error, stdout, stderr) {
if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, 'Error backing up : ' + stderr));
addons.restoreAddons(app, function (error) {
if (error) return callback(error);
callback(null);
});
callback(null);
});
});
}
function backupApp(app, callback) {
addons.backupAddons(app, function (error) {
getBackupUrl(app.id, null, function (error, result) {
if (error) return callback(error);
getBackupUrl(app.id, null, function (error, result) {
if (error) return callback(error);
debug('backupApp: %s (%s) app url:%s id:%s', app.id, app.manifest.title, result.url, result.id);
debug('backupApp: %s (%s) app url:%s id:%s', app.id, app.manifest.title, result.url, result.id);
execFile(SUDO, [ BACKUP_APP_CMD, app.id, result.url, result.backupKey ], { }, function (error, stdout, stderr) {
if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, 'Error backing up : ' + stderr));
execFile(SUDO, [ BACKUP_APP_CMD, app.id, result.url, result.backupKey ], { }, function (error, stdout, stderr) {
if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, 'Error backing up : ' + stderr));
debug('backupApp: %s (%s) successful', app.id, app.manifest.title);
debug('backupApp: %s (%s) successful', app.id, app.manifest.title);
apps.setLastBackupId(app.id, result.id, callback.bind(null, null, result.id));
});
});
apps.setLastBackupId(app.id, result.id, callback.bind(null, null, result.id));
});
});
}