fix: ioredis upgrade fix, maybe

v1.18.x
Barış Soner Uşaklı 4 years ago
parent 4afca6900b
commit 1ce595083a

@ -4,9 +4,6 @@ const async = require('async');
const nconf = require('nconf'); const nconf = require('nconf');
const packageInstall = require('./package-install'); const packageInstall = require('./package-install');
const upgrade = require('../upgrade');
const build = require('../meta/build');
const db = require('../database');
const { upgradePlugins } = require('./upgrade-plugins'); const { upgradePlugins } = require('./upgrade-plugins');
const steps = { const steps = {
@ -31,7 +28,7 @@ const steps = {
message: 'Checking installed plugins for updates...', message: 'Checking installed plugins for updates...',
handler: function (next) { handler: function (next) {
async.series([ async.series([
db.init, require('../database').init,
upgradePlugins, upgradePlugins,
], next); ], next);
}, },
@ -40,15 +37,15 @@ const steps = {
message: 'Updating NodeBB data store schema...', message: 'Updating NodeBB data store schema...',
handler: function (next) { handler: function (next) {
async.series([ async.series([
db.init, require('../database').init,
require('../meta').configs.init, require('../meta').configs.init,
upgrade.run, require('../upgrade').run,
], next); ], next);
}, },
}, },
build: { build: {
message: 'Rebuilding assets...', message: 'Rebuilding assets...',
handler: build.buildAll, handler: require('../meta/build').buildAll,
}, },
}; };
@ -96,10 +93,10 @@ function runUpgrade(upgrades, options) {
} }
async.series([ async.series([
db.init, require('../database').init,
require('../meta').configs.init, require('../meta').configs.init,
async function () { async function () {
await upgrade.runParticular(upgrades); await require('../upgrade').runParticular(upgrades);
}, },
], (err) => { ], (err) => {
if (err) { if (err) {

Loading…
Cancel
Save