Merge branch 'master' into dev

This commit is contained in:
Nick O'Leary
2021-05-12 16:00:36 +01:00
14 changed files with 120 additions and 72 deletions

View File

@@ -220,7 +220,7 @@ var reinstallTimeout;
function reinstallModules(moduleList) {
const promises = [];
const reinstallList = [];
const installRetry = 30000;
var installRetry = 30000;
if (settings.hasOwnProperty('autoInstallModulesRetry')) {
log.warn(log._("server.deprecatedOption",{old:"autoInstallModulesRetry", new:"externalModules.autoInstallRetry"}));
installRetry = settings.autoInstallModulesRetry;