Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 16:46:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: #9135, don't try to reconnect forever

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2020-12-28 11:44:14 -05:00
parent a555f02415
commit c1ecfd1ebf
5 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
install/data/defaults.json
View File

@@ -150,5 +150,7 @@
"useCompression": 0, "useCompression": 0,
"updateUrlWithPostIndex": 1, "updateUrlWithPostIndex": 1,
"composer:showHelpTab": 1, "composer:showHelpTab": 1,
"composer:allowPluginHelp": 1 "composer:allowPluginHelp": 1,
"maxReconnectionAttempts": 5,
"reconnectionDelay": 1500
} }

1
public/language/en-GB/error.json
View File

@@ -208,6 +208,7 @@
"already-blocked": "This user is already blocked", "already-blocked": "This user is already blocked",
"already-unblocked": "This user is already unblocked", "already-unblocked": "This user is already unblocked",
"no-connection": "There seems to be a problem with your internet connection", "no-connection": "There seems to be a problem with your internet connection",
"socket-reconnect-failed": "Reconnect failed, please try again later",
"plugin-not-whitelisted": "Unable to install plugin – only plugins whitelisted by the NodeBB Package Manager can be installed via the ACP" "plugin-not-whitelisted": "Unable to install plugin – only plugins whitelisted by the NodeBB Package Manager can be installed via the ACP"
} }

1
public/src/ajaxify.js
View File

@@ -409,6 +409,7 @@ ajaxify = window.ajaxify || {};
require(['translator', 'benchpress'], function (translator, Benchpress) { require(['translator', 'benchpress'], function (translator, Benchpress) {
translator.translate('[[error:no-connection]]'); translator.translate('[[error:no-connection]]');
translator.translate('[[error:socket-reconnect-failed]]');
Benchpress.registerLoader(ajaxify.loadTemplate); Benchpress.registerLoader(ajaxify.loadTemplate);
Benchpress.setGlobal('config', config); Benchpress.setGlobal('config', config);
}); });

6
public/src/sockets.js
View File

@@ -45,8 +45,10 @@ socket = window.socket;
socket.on('disconnect', onDisconnect); socket.on('disconnect', onDisconnect);
socket.io.on('reconnect_failed', function () { socket.io.on('reconnect_failed', function () {
// Wait ten times the reconnection delay and then start over $('#reconnect-alert').removeClass('alert-warning')
setTimeout(socket.connect.bind(socket), parseInt(config.reconnectionDelay, 10) * 10); .addClass('alert-danger')
.find('p')
.translateText('[[error:socket-reconnect-failed]]');
}); });
socket.on('checkSession', function (uid) { socket.on('checkSession', function (uid) {

4
src/controllers/api.js
View File

@@ -49,8 +49,8 @@ apiController.loadConfig = async function (req) {
socketioTransports, socketioTransports,
socketioOrigins, socketioOrigins,
websocketAddress, websocketAddress,
maxReconnectionAttempts: meta.config.maxReconnectionAttempts || 5, maxReconnectionAttempts: meta.config.maxReconnectionAttempts,
reconnectionDelay: meta.config.reconnectionDelay || 1500, reconnectionDelay: meta.config.reconnectionDelay,
topicsPerPage: meta.config.topicsPerPage || 20, topicsPerPage: meta.config.topicsPerPage || 20,
postsPerPage: meta.config.postsPerPage || 20, postsPerPage: meta.config.postsPerPage || 20,
maximumFileSize: meta.config.maximumFileSize, maximumFileSize: meta.config.maximumFileSize,