From 818735e2c8d593492cd7c8eaff6a40fb1abb468b Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Wed, 26 Sep 2018 09:48:18 -0700 Subject: [PATCH] Fix import of older redis backups --- src/addons.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/addons.js b/src/addons.js index 8fca379fb..e3ad12dc3 100644 --- a/src/addons.js +++ b/src/addons.js @@ -1134,7 +1134,13 @@ function restoreRedis(app, options, callback) { getAddonDetails('redis-' + app.id, 'CLOUDRON_REDIS_TOKEN', function (error, result) { if (error) return callback(error); - var input = fs.createReadStream(path.join(paths.APPS_DATA_DIR, app.id, 'dump.rdb')); + let input; + let oldDumpLocation = path.join(paths.APPS_DATA_DIR, app.id, 'redis/dump.rdb'); + if (fs.existsSync(oldDumpLocation)) { + input = fs.createReadStream(oldDumpLocation); + } else { + input = fs.createReadStream(path.join(paths.APPS_DATA_DIR, app.id, 'dump.rdb')); + } input.on('error', callback); const restoreReq = request.post(`https://${result.ip}:3000/restore?access_token=${result.token}`, { rejectUnauthorized: false }, function (error, response) {