diff --git a/src/apptask.js b/src/apptask.js index c2e3b8996..5f0899cf4 100644 --- a/src/apptask.js +++ b/src/apptask.js @@ -282,7 +282,7 @@ async function startApp(app) { await docker.startContainer(app.id); } -async function install(app, args, progressCallback) { +async function installCommand(app, args, progressCallback) { assert.strictEqual(typeof app, 'object'); assert.strictEqual(typeof args, 'object'); assert.strictEqual(typeof progressCallback, 'function'); @@ -391,7 +391,7 @@ async function install(app, args, progressCallback) { await updateApp(app, { installationState: apps.ISTATE_INSTALLED, error: null, health: null }); } -async function backup(app, args, progressCallback) { +async function backupCommand(app, args, progressCallback) { assert.strictEqual(typeof app, 'object'); assert.strictEqual(typeof args, 'object'); assert.strictEqual(typeof progressCallback, 'function'); @@ -406,7 +406,7 @@ async function backup(app, args, progressCallback) { return backupId; } -async function create(app, args, progressCallback) { +async function createCommand(app, args, progressCallback) { assert.strictEqual(typeof app, 'object'); assert.strictEqual(typeof args, 'object'); assert.strictEqual(typeof progressCallback, 'function'); @@ -427,7 +427,7 @@ async function create(app, args, progressCallback) { await updateApp(app, { installationState: apps.ISTATE_INSTALLED, error: null, health: null }); } -async function changeLocation(app, args, progressCallback) { +async function changeLocationCommand(app, args, progressCallback) { assert.strictEqual(typeof app, 'object'); assert.strictEqual(typeof args, 'object'); assert.strictEqual(typeof progressCallback, 'function'); @@ -493,7 +493,7 @@ async function changeLocation(app, args, progressCallback) { await updateApp(app, { installationState: apps.ISTATE_INSTALLED, error: null, health: null }); } -async function changeServices(app, args, progressCallback) { +async function changeServicesCommand(app, args, progressCallback) { assert.strictEqual(typeof app, 'object'); assert.strictEqual(typeof args, 'object'); assert.strictEqual(typeof progressCallback, 'function'); @@ -522,7 +522,7 @@ async function changeServices(app, args, progressCallback) { await updateApp(app, { installationState: apps.ISTATE_INSTALLED, error: null, health: null }); } -async function migrateDataDir(app, args, progressCallback) { +async function migrateDataDirCommand(app, args, progressCallback) { assert.strictEqual(typeof app, 'object'); assert.strictEqual(typeof args, 'object'); assert.strictEqual(typeof progressCallback, 'function'); @@ -556,7 +556,7 @@ async function migrateDataDir(app, args, progressCallback) { } // configure is called for an infra update and repair to re-create container, reverseproxy config. it's all "local" -async function configure(app, args, progressCallback) { +async function configureCommand(app, args, progressCallback) { assert.strictEqual(typeof app, 'object'); assert.strictEqual(typeof args, 'object'); assert.strictEqual(typeof progressCallback, 'function'); @@ -590,7 +590,7 @@ async function configure(app, args, progressCallback) { await updateApp(app, { installationState: apps.ISTATE_INSTALLED, error: null, health: null }); } -async function update(app, args, progressCallback) { +async function updateCommand(app, args, progressCallback) { assert.strictEqual(typeof app, 'object'); assert.strictEqual(typeof args, 'object'); assert.strictEqual(typeof progressCallback, 'function'); @@ -695,7 +695,7 @@ async function update(app, args, progressCallback) { await updateApp(app, { installationState: apps.ISTATE_INSTALLED, error: null, health: null, updateTime: new Date() }); } -async function start(app, args, progressCallback) { +async function startCommand(app, args, progressCallback) { assert.strictEqual(typeof app, 'object'); assert.strictEqual(typeof args, 'object'); assert.strictEqual(typeof progressCallback, 'function'); @@ -716,11 +716,12 @@ async function start(app, args, progressCallback) { await updateApp(app, { installationState: apps.ISTATE_INSTALLED, error: null, health: null }); } -async function stop(app, args, progressCallback) { +async function stopCommand(app, args, progressCallback) { assert.strictEqual(typeof app, 'object'); assert.strictEqual(typeof args, 'object'); assert.strictEqual(typeof progressCallback, 'function'); + // we don't delete the containers. app containers are created with the unless-stopped restart policy. there is no danger of apps getting restarted on reboot await progressCallback({ percent: 20, message: 'Stopping container' }); await reverseProxy.unconfigureApp(app); // removing nginx configs also means that we can auto-cleanup old certs since they are not referenced await docker.stopContainers(app.id); @@ -732,7 +733,7 @@ async function stop(app, args, progressCallback) { await updateApp(app, { installationState: apps.ISTATE_INSTALLED, error: null, health: null }); } -async function restart(app, args, progressCallback) { +async function restartCommand(app, args, progressCallback) { assert.strictEqual(typeof app, 'object'); assert.strictEqual(typeof args, 'object'); assert.strictEqual(typeof progressCallback, 'function'); @@ -753,7 +754,7 @@ async function restart(app, args, progressCallback) { await updateApp(app, { installationState: apps.ISTATE_INSTALLED, error: null, health: null }); } -async function uninstall(app, args, progressCallback) { +async function uninstallCommand(app, args, progressCallback) { assert.strictEqual(typeof app, 'object'); assert.strictEqual(typeof args, 'object'); assert.strictEqual(typeof progressCallback, 'function'); @@ -799,42 +800,42 @@ async function run(appId, args, progressCallback) { case apps.ISTATE_PENDING_CLONE: case apps.ISTATE_PENDING_RESTORE: case apps.ISTATE_PENDING_IMPORT: - cmd = install(app, args, progressCallback); + cmd = installCommand(app, args, progressCallback); break; case apps.ISTATE_PENDING_CONFIGURE: - cmd = configure(app, args, progressCallback); + cmd = configureCommand(app, args, progressCallback); break; - case apps.ISTATE_PENDING_RECREATE_CONTAINER: - case apps.ISTATE_PENDING_RESIZE: + case apps.ISTATE_PENDING_RECREATE_CONTAINER: // mounts/devices/env + case apps.ISTATE_PENDING_RESIZE: // memory/cpu case apps.ISTATE_PENDING_DEBUG: - cmd = create(app, args, progressCallback); + cmd = createCommand(app, args, progressCallback); break; case apps.ISTATE_PENDING_LOCATION_CHANGE: - cmd = changeLocation(app, args, progressCallback); + cmd = changeLocationCommand(app, args, progressCallback); break; case apps.ISTATE_PENDING_SERVICES_CHANGE: - cmd = changeServices(app, args, progressCallback); + cmd = changeServicesCommand(app, args, progressCallback); break; case apps.ISTATE_PENDING_DATA_DIR_MIGRATION: - cmd = migrateDataDir(app, args, progressCallback); + cmd = migrateDataDirCommand(app, args, progressCallback); break; case apps.ISTATE_PENDING_UNINSTALL: - cmd = uninstall(app, args, progressCallback); + cmd = uninstallCommand(app, args, progressCallback); break; case apps.ISTATE_PENDING_UPDATE: - cmd = update(app, args, progressCallback); + cmd = updateCommand(app, args, progressCallback); break; case apps.ISTATE_PENDING_BACKUP: - cmd = backup(app, args, progressCallback); + cmd = backupCommand(app, args, progressCallback); break; case apps.ISTATE_PENDING_START: - cmd = start(app, args, progressCallback); + cmd = startCommand(app, args, progressCallback); break; case apps.ISTATE_PENDING_STOP: - cmd = stop(app, args, progressCallback); + cmd = stopCommand(app, args, progressCallback); break; case apps.ISTATE_PENDING_RESTART: - cmd = restart(app, args, progressCallback); + cmd = restartCommand(app, args, progressCallback); break; case apps.ISTATE_INSTALLED: // can only happen when we have a bug in our code while testing/development cmd = updateApp(app, { installationState: apps.ISTATE_INSTALLED, error: null, health: null });