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

remove special rm script for redis

Browse Source
This commit is contained in:
Girish Ramakrishnan
2018-10-15 14:38:33 -07:00
parent 816fa94555
commit 2c60614d4b
5 changed files with 4 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/addons.js
View File

@@ -47,7 +47,7 @@ var accesscontrol = require('./accesscontrol.js'),
util = require('util');
var NOOP = function (app, options, callback) { return callback(); };
const RMREDIS_CMD = path.join(__dirname, 'scripts/rmredis.sh');
const RMADDON_CMD = path.join(__dirname, 'scripts/rmaddon.sh');
// setup can be called multiple times for the same app (configure crash restart) and existing data must not be lost
// teardown is destructive. app data stored with the addon is lost
@@ -1116,7 +1116,7 @@ function teardownRedis(app, options, callback) {
container.remove(removeOptions, function (error) {
if (error && error.statusCode !== 404) return callback(new Error('Error removing container:' + error));
shell.sudo('removeVolume', [ RMREDIS_CMD, app.id ], function (error) {
shell.sudo('removeVolume', [ RMADDON_CMD, 'redis', app.id ], function (error) {
if (error) return callback(new Error('Error removing redis data:' + error));
rimraf(path.join(paths.LOG_DIR, `redis-${app.id}`), function (error) {