hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into room-optimize

Browse Source
v1.18.x
barisusakli 9 years ago
parent 364260fa37 b8b9da2c30
commit 9125e778a1
6 changed files with 205 additions and 3 deletions
Show Stats Download Patch File Download Diff File

1
package.json
Unescape Escape View File

@ -68,6 +68,7 @@
"socketio-wildcard": "~0.1.1", "socketio-wildcard": "~0.1.1",
"string": "^3.0.0", "string": "^3.0.0",
"templates.js": "0.3.0", "templates.js": "0.3.0",
"toobusy-js": "^0.4.2",
"uglify-js": "^2.4.24", "uglify-js": "^2.4.24",
"underscore": "~1.8.3", "underscore": "~1.8.3",
"underscore.deep": "^0.5.1", "underscore.deep": "^0.5.1",

160
public/503.html
Unescape Escape View File

@ -0,0 +1,160 @@
<html>
<head>
<title>Excessive Load Warning</title>
<link href='http://fonts.googleapis.com/css?family=Ubuntu:400,500,700' rel='stylesheet' type='text/css'>
<style type="text/css">
body {
background: #00A9EA;
color: white;
font-family: 'Ubuntu', sans-serif;
text-align: center;
-webkit-transform-style: preserve-3d;
-moz-transform-style: preserve-3d;
transform-style: preserve-3d;
}
h1 {
font-size: 250px;
color: #fff;
opacity: 0.5;
margin: 10px;
cursor: pointer;
-moz-user-select: none;
-khtml-user-select: none;
-webkit-user-select: none;
}
p {
font-size: 20px;
}
p strong {
font-size: 28px;
}
.center {
position: relative;
top: 50%;
-webkit-transform: translateY(50%);
-ms-transform: translateY(50%);
transform: translateY(50%);
}
@-webkit-keyframes bounce {
0%, 20%, 53%, 80%, 100% {
-webkit-transition-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
transition-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
-webkit-transform: translate3d(0,0,0);
transform: translate3d(0,0,0);
}
40%, 43% {
-webkit-transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
-webkit-transform: translate3d(0, -30px, 0);
transform: translate3d(0, -30px, 0);
}
70% {
-webkit-transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
-webkit-transform: translate3d(0, -15px, 0);
transform: translate3d(0, -15px, 0);
}
90% {
-webkit-transform: translate3d(0,-4px,0);
transform: translate3d(0,-4px,0);
}
}
@keyframes bounce {
0%, 20%, 53%, 80%, 100% {
-webkit-transition-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
transition-timing-function: cubic-bezier(0.215, 0.610, 0.355, 1.000);
-webkit-transform: translate3d(0,0,0);
transform: translate3d(0,0,0);
}
40%, 43% {
-webkit-transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
-webkit-transform: translate3d(0, -30px, 0);
transform: translate3d(0, -30px, 0);
}
70% {
-webkit-transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
transition-timing-function: cubic-bezier(0.755, 0.050, 0.855, 0.060);
-webkit-transform: translate3d(0, -15px, 0);
transform: translate3d(0, -15px, 0);
}
90% {
-webkit-transform: translate3d(0,-4px,0);
transform: translate3d(0,-4px,0);
}
}
.bounce {
-webkit-animation-name: bounce;
animation-name: bounce;
-webkit-transform-origin: center bottom;
-ms-transform-origin: center bottom;
transform-origin: center bottom;
}
.animated {
-webkit-animation-duration: 1s;
animation-duration: 1s;
-webkit-animation-fill-mode: both;
animation-fill-mode: both;
}
.animated.infinite {
-webkit-animation-iteration-count: infinite;
animation-iteration-count: infinite;
}
.animated.hinge {
-webkit-animation-duration: 2s;
animation-duration: 2s;
}
.hide {
display: none;
}
</style>
<script type="text/javascript">
window.onload = function() {
var count = 0,
bounce = document.getElementById('click-me');
bounce.onclick = function() {
count++;
bounce.className = '';
setTimeout(function() {
bounce.className = 'animated bounce';
}, 50);
if (count > 5) {
document.getElementById('hide').className = '';
}
};
}
</script>
</head>
<body>
<div class="wrapper">
<div class="center">
<h1 id="click-me" class="animated bounce">503</h1>
<p>
<strong>This forum is temporarily unavailable due to excessive load.</strong> <br />
We shouldn't be down for long. Please check back shortly. Sorry for the inconvenience!
</p>
<p id="hide" class="hide">
<small>Alright. You can stop clicking... it's not going to make the site come back sooner!</small>
</p>
</div>
</div>
</body>
</html>

4
public/language/en_GB/pages.json
Unescape Escape View File

@ -42,5 +42,7 @@
"account/watched": "Topics watched by %1", "account/watched": "Topics watched by %1",
"maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.", "maintenance.text": "%1 is currently undergoing maintenance. Please come back another time.",
"maintenance.messageIntro": "Additionally, the administrator has left this message:" "maintenance.messageIntro": "Additionally, the administrator has left this message:",
"throttled.text": "%1 is currently unavailable due to excessive load. Please come back another time."
} }

12
src/middleware/middleware.js
Unescape Escape View File

@ -11,13 +11,13 @@ var app,
validator = require('validator'), validator = require('validator'),
nconf = require('nconf'), nconf = require('nconf'),
ensureLoggedIn = require('connect-ensure-login'), ensureLoggedIn = require('connect-ensure-login'),
toobusy = require('toobusy-js'),
plugins = require('../plugins'), plugins = require('../plugins'),
meta = require('../meta'), meta = require('../meta'),
user = require('../user'), user = require('../user'),
groups = require('../groups'), groups = require('../groups'),
analytics = require('../analytics'), analytics = require('../analytics'),
controllers = { controllers = {
@ -25,6 +25,9 @@ var app,
helpers: require('../controllers/helpers') helpers: require('../controllers/helpers')
}; };
toobusy.maxLag(parseInt(meta.config.eventLoopLagThreshold, 10) || 70);
toobusy.interval(parseInt(meta.config.eventLoopInterval, 10) || 500);
middleware.authenticate = function(req, res, next) { middleware.authenticate = function(req, res, next) {
if (req.user) { if (req.user) {
return next(); return next();
@ -217,6 +220,13 @@ middleware.privateUploads = function(req, res, next) {
next(); next();
}; };
middleware.busyCheck = function(req, res, next) {
if (toobusy()) {
res.type('text/html').sendFile(path.join(__dirname, '../../public/503.html'));
} else {
next();
}
};
module.exports = function(webserver) { module.exports = function(webserver) {
app = webserver; app = webserver;

2
src/routes/helpers.js
Unescape Escape View File

@ -5,7 +5,7 @@ var helpers = {};
helpers.setupPageRoute = function(router, name, middleware, middlewares, controller) { helpers.setupPageRoute = function(router, name, middleware, middlewares, controller) {
middlewares = middlewares.concat([middleware.pageView, middleware.pluginHooks]); middlewares = middlewares.concat([middleware.pageView, middleware.pluginHooks]);
router.get(name, middleware.buildHeader, middlewares, controller); router.get(name, middleware.busyCheck, middleware.buildHeader, middlewares, controller);
router.get('/api' + name, middlewares, controller); router.get('/api' + name, middlewares, controller);
}; };

29
src/views/admin/settings/advanced.tpl
Unescape Escape View File

@ -41,4 +41,33 @@
</div> </div>
</div> </div>
<div class="row">
<div class="col-sm-2 col-xs-12 settings-header">Traffic Management</div>
<div class="col-sm-10 col-xs-12">
<p class="help-block">
NodeBB deploys equipped with a module that automatically denies requests in high-traffic
situations. You can tune these settings here, although the defaults are a good starting
point.
</p>
<form>
<div class="form-group">
<label for="eventLoopLagThreshold">Event Loop Lag Threshold (in milliseconds)</label>
<input class="form-control" id="eventLoopLagThreshold" type="number" data-field="eventLoopLagThreshold" placeholder="Default: 70" step="10" value="70" />
<p class="help-block">
Lowering this value decreases wait times for page loads, but will also show the
"excessive load" message to more users. (Reload required)
</p>
</div>
<div class="form-group">
<label for="eventLoopInterval">Check Interval (in milliseconds)</label>
<input class="form-control" id="eventLoopInterval" type="number" data-field="eventLoopInterval" placeholder="Default: 500" value="500" step="50" />
<p class="help-block">
Lowering this value causes NodeBB to become more sensitive to spikes in load, but
may also cause the check to become too sensitive. (Reload required)
</p>
</div>
</form>
</div>
</div>
<!-- IMPORT admin/settings/footer.tpl --> <!-- IMPORT admin/settings/footer.tpl -->
Write Preview
Loading…
Cancel
Save