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

refactor: make removeVolume not clear

Browse Source
This commit is contained in:
Girish Ramakrishnan
2019-01-15 09:36:32 -08:00
parent 13fac3072d
commit 9d45e4e0ae
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/addons.js
View File

@@ -751,7 +751,10 @@ function teardownLocalStorage(app, options, callback) {
debugApp(app, 'teardownLocalStorage');
docker.removeVolume(app, `${app.id}-localstorage`, callback);
async.series([
docker.clearVolume.bind(null, app, `${app.id}-localstorage`),
docker.removeVolume.bind(null, app, `${app.id}-localstorage`)
], callback);
}
function setupOauth(app, options, callback) {

12
src/docker.js
View File

@@ -571,14 +571,10 @@ function removeVolume(app, name, callback) {
let docker = exports.connection;
clearVolume(app, name, function (error) {
if (error) return callback(error);
let volume = docker.getVolume(name);
volume.remove(function (error) {
if (error && error.statusCode !== 404) return callback(new Error(`removeVolume: Error removing volume of ${app.id} ${error.message}`));
let volume = docker.getVolume(name);
volume.remove(function (error) {
if (error && error.statusCode !== 404) return callback(new Error(`removeVolume: Error removing volume of ${app.id} ${error.message}`));
callback();
});
callback();
});
}