summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSheogorath2019-05-25 21:17:28 +0200
committerGitHub2019-05-25 21:17:28 +0200
commit678d1396916523effd393791238879c0cac15e05 (patch)
tree536e541ee0bde9ebc2d356afb8728bf8df76f980
parent816ed4ebc7e0265b353f80285fe9601b2231dd90 (diff)
parent6c62efae2ad2dac6f4c58bd84726cfb36ea9a84b (diff)
Merge pull request #6 from SISheogorath/feautre/notTooBusy
Add config for toobusy middleware
Diffstat (limited to '')
-rw-r--r--docs/configuration-config-file.md1
-rw-r--r--docs/configuration-env-vars.md1
-rw-r--r--lib/config/default.js2
-rw-r--r--lib/config/environment.js1
-rw-r--r--lib/web/middleware/tooBusy.js4
5 files changed, 9 insertions, 0 deletions
diff --git a/docs/configuration-config-file.md b/docs/configuration-config-file.md
index cbc6534d..b233cebe 100644
--- a/docs/configuration-config-file.md
+++ b/docs/configuration-config-file.md
@@ -32,6 +32,7 @@ to `config.json` before filling in your own details.
| `imageUploadType` | `imgur`, `s3`, `minio`, `azure`, `lutim` or `filesystem`(default) | Where to upload images. For S3, see our Image Upload Guides for [S3](guides/s3-image-upload.md) or [Minio](guides/minio-image-upload.md)|
| `sourceURL` | `https://github.com/codimd/server/tree/<current commit>` | Provides the link to the source code of CodiMD on the entry page (Please, make sure you change this when you run a modified version) |
| `staticCacheTime` | `1 * 24 * 60 * 60 * 1000` | static file cache time |
+| `tooBusyLag` | `70` | CPU time for one eventloop tick until node throttles connections. (milliseconds) |
| `heartbeatInterval` | `5000` | socket.io heartbeat interval |
| `heartbeatTimeout` | `10000` | socket.io heartbeat timeout |
| `documentMaxLength` | `100000` | note max length |
diff --git a/docs/configuration-env-vars.md b/docs/configuration-env-vars.md
index ba635cde..bc0eac99 100644
--- a/docs/configuration-env-vars.md
+++ b/docs/configuration-env-vars.md
@@ -35,6 +35,7 @@ defaultNotePath can't be set from env-vars
| `CMD_FORBIDDEN_NOTE_IDS` | `'robots.txt'` | disallow creation of notes, even if `CMD_ALLOW_FREEURL` is `true` |
| `CMD_IMAGE_UPLOAD_TYPE` | `imgur`, `s3`, `minio`, `lutim` or `filesystem` | Where to upload images. For S3, see our Image Upload Guides for [S3](guides/s3-image-upload.md) or [Minio](guides/minio-image-upload.md), also there's a whole section on their respective env vars below. |
| `CMD_SOURCE_URL` | `https://github.com/codimd/server/tree/<current commit>` | Provides the link to the source code of CodiMD on the entry page (Please, make sure you change this when you run a modified version) |
+| `CMD_TOOBUSY_LAG` | `70` | CPU time for one eventloop tick until node throttles connections. (milliseconds) |
## CodiMD Location
diff --git a/lib/config/default.js b/lib/config/default.js
index c87beda3..12254d47 100644
--- a/lib/config/default.js
+++ b/lib/config/default.js
@@ -56,6 +56,8 @@ module.exports = {
// socket.io
heartbeatInterval: 5000,
heartbeatTimeout: 10000,
+ // too busy timeout
+ tooBusyLag: 70,
// document
documentMaxLength: 100000,
// image upload setting, available options are imgur/s3/filesystem/azure/lutim
diff --git a/lib/config/environment.js b/lib/config/environment.js
index 508c1ba6..0a709745 100644
--- a/lib/config/environment.js
+++ b/lib/config/environment.js
@@ -33,6 +33,7 @@ module.exports = {
dbURL: process.env.CMD_DB_URL,
sessionSecret: process.env.CMD_SESSION_SECRET,
sessionLife: toIntegerConfig(process.env.CMD_SESSION_LIFE),
+ tooBusyLag: toIntegerConfig(process.env.CMD_TOOBUSY_LAG),
imageUploadType: process.env.CMD_IMAGE_UPLOAD_TYPE,
imgur: {
clientID: process.env.CMD_IMGUR_CLIENTID
diff --git a/lib/web/middleware/tooBusy.js b/lib/web/middleware/tooBusy.js
index f1b72330..128a5679 100644
--- a/lib/web/middleware/tooBusy.js
+++ b/lib/web/middleware/tooBusy.js
@@ -2,7 +2,11 @@
const toobusy = require('toobusy-js')
+
const response = require('../../response')
+const config = require('../../config')
+
+toobusy.maxLag(config.tooBusyLag)
module.exports = function (req, res, next) {
if (toobusy()) {