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

Send taskId in the response

Browse Source
This commit is contained in:
Girish Ramakrishnan
2019-08-27 20:55:49 -07:00
parent 20de563925
commit 5952a5c69d
2 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/apps.js
View File

@@ -727,7 +727,7 @@ function install(data, user, auditSource, callback) {
eventlog.add(eventlog.ACTION_APP_INSTALL, auditSource, { appId: appId, app: result });
callback(null, { id : appId });
callback(null, { id : appId, taskId: result.taskId });
});
});
});
@@ -873,7 +873,7 @@ function configure(appId, data, user, auditSource, callback) {
eventlog.add(eventlog.ACTION_APP_CONFIGURE, auditSource, { appId: appId, app: result });
callback(null);
callback(null, { taskId: result.taskId });
});
});
});
@@ -944,7 +944,7 @@ function update(appId, data, auditSource, callback) {
if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.BAD_STATE)); // might be a bad guess
if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
startAppTask(appId, { updateConfig: updateConfig }, function (error) {
startAppTask(appId, { updateConfig: updateConfig }, function (error, result) {
if (error) return callback(error);
eventlog.add(eventlog.ACTION_APP_UPDATE, auditSource, { appId: appId, toManifest: manifest, fromManifest: app.manifest, force: data.force, app: app });
@@ -952,7 +952,7 @@ function update(appId, data, auditSource, callback) {
// clear update indicator, if update fails, it will come back through the update checker
updateChecker.resetAppUpdateInfo(appId);
callback(null);
callback(null, { taskId: result.taskId });
});
});
});
@@ -1047,12 +1047,12 @@ function restore(appId, data, auditSource, callback) {
if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
const restoreConfig = data.backupId ? { backupId: data.backupId, backupFormat: backupInfo.format, oldManifest: app.manifest } : null; // when null, apptask simply reinstalls
startAppTask(appId, { restoreConfig }, function (error) {
startAppTask(appId, { restoreConfig }, function (error, result) {
if (error) return callback(error);
eventlog.add(eventlog.ACTION_APP_RESTORE, auditSource, { app: app, backupId: backupInfo.id, fromManifest: app.manifest, toManifest: backupInfo.manifest });
callback(null);
callback(null, { taskId: result.taskId });
});
});
});
@@ -1162,7 +1162,7 @@ function clone(appId, data, user, auditSource, callback) {
eventlog.add(eventlog.ACTION_APP_CLONE, auditSource, { appId: newAppId, oldAppId: appId, backupId: backupId, oldApp: app, newApp: result });
callback(null, { id: newAppId });
callback(null, { id: newAppId, taskId: result.taskId });
});
});
});
@@ -1197,7 +1197,7 @@ function uninstall(appId, auditSource, callback) {
eventlog.add(eventlog.ACTION_APP_UNINSTALL, auditSource, { appId: appId, app: result });
callback(null);
callback(null, { taskId: result.taskId });
});
});
});
@@ -1376,7 +1376,11 @@ function backup(appId, callback) {
if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.BAD_STATE)); // might be a bad guess
if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
startAppTask(appId, {}, callback);
startAppTask(appId, { }, (error, result) => {
if (error) return callback(error);
callback(null, { taskId: result.taskId });
});
});
});
}