diff --git a/.eslintrc b/.eslintrc index 70abc88e1e..91d40d2486 100644 --- a/.eslintrc +++ b/.eslintrc @@ -24,7 +24,7 @@ "consistent-return": "off", "func-names": "off", "no-tabs": "off", - "indent": ["error", "tab"], + "indent": ["error", "tab", { "SwitchCase": 1 }], "no-eq-null": "off", "camelcase": "off", "no-new": "off", diff --git a/install/package.json b/install/package.json index b941016d77..35668044b4 100644 --- a/install/package.json +++ b/install/package.json @@ -74,24 +74,24 @@ "material-design-lite": "^1.3.0", "mime": "^2.4.4", "mkdirp": "^1.0.4", - "mongodb": "3.5.7", + "mongodb": "3.5.8", "morgan": "^1.10.0", "mousetrap": "^1.6.5", "@nodebb/mubsub": "^1.6.0", "nconf": "^0.10.0", - "nodebb-plugin-composer-default": "6.3.32", + "nodebb-plugin-composer-default": "6.3.34", "nodebb-plugin-dbsearch": "4.0.7", "nodebb-plugin-emoji": "^3.3.0", "nodebb-plugin-emoji-android": "2.0.0", "nodebb-plugin-markdown": "8.11.2", "nodebb-plugin-mentions": "2.7.4", "nodebb-plugin-soundpack-default": "1.0.0", - "nodebb-plugin-spam-be-gone": "0.7.0", + "nodebb-plugin-spam-be-gone": "0.7.1", "nodebb-rewards-essentials": "0.1.3", "nodebb-theme-lavender": "5.0.11", - "nodebb-theme-persona": "10.1.42", + "nodebb-theme-persona": "10.1.44", "nodebb-theme-slick": "1.2.29", - "nodebb-theme-vanilla": "11.1.18", + "nodebb-theme-vanilla": "11.1.19", "nodebb-widget-essentials": "4.1.0", "nodemailer": "^6.4.6", "passport": "^0.4.1", @@ -143,7 +143,7 @@ "grunt-contrib-watch": "1.1.0", "husky": "4.2.5", "jsdom": "16.2.2", - "lint-staged": "10.2.6", + "lint-staged": "10.2.8", "mocha": "7.2.0", "mocha-lcov-reporter": "1.3.0", "nyc": "15.0.1", diff --git a/loader.js b/loader.js index eea0bf9c8a..982d6374e8 100644 --- a/loader.js +++ b/loader.js @@ -87,22 +87,22 @@ Loader.addWorkerEvents = function (worker) { worker.on('message', function (message) { if (message && typeof message === 'object' && message.action) { switch (message.action) { - case 'restart': - console.log('[cluster] Restarting...'); - Loader.restart(); - break; - case 'pubsub': - workers.forEach(function (w) { - w.send(message); - }); - break; - case 'socket.io': - workers.forEach(function (w) { - if (w !== worker) { + case 'restart': + console.log('[cluster] Restarting...'); + Loader.restart(); + break; + case 'pubsub': + workers.forEach(function (w) { w.send(message); - } - }); - break; + }); + break; + case 'socket.io': + workers.forEach(function (w) { + if (w !== worker) { + w.send(message); + } + }); + break; } } }); diff --git a/public/503.html b/public/503.html index 119c710ab7..68c9386146 100644 --- a/public/503.html +++ b/public/503.html @@ -1,13 +1,13 @@ Excessive Load Warning -