Skip to content

Fix hung default #1909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 28, 2021
Merged

Fix hung default #1909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion models/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"secret" : "someSecretStringForSession",
"connect" : "mongodb://dev:[email protected]:31963/openuserjs_devel",
"connect" : "mongodb://dev:oujs123@localhost/openuserjs_devel",
"limiter" : "mongodb://dev:oujs123@localhost:27017",
"maximum_upload_script_size": 1048576,
"ttl": {
"minimum": 2,
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "OpenUserJS.org",
"description": "An open source user scripts repo built using Node.js",
"version": "0.5.2",
"version": "0.5.3",
"main": "app",
"dependencies": {
"ace-builds": "1.4.13",
Expand Down
11 changes: 6 additions & 5 deletions routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,12 @@ var statusCodePage = require('./libs/templateHelpers').statusCodePage;
var settings = require('./models/settings.json');

//--
var limiter = process.env.LIMITER_STRING || settings.limiter;

var waitInstallMin = isDev ? 1 : 60;
var installLimiter = rateLimit({
store: (isDev ? undefined : new MongoStore({
uri: 'mongodb://127.0.0.1:27017/installLimiter',
uri: limiter + '/installLimiter',
resetExpireDateOnChange: true, // Rolling
expireTimeMs: waitInstallMin * 60 * 1000 // n minutes for mongo store
})),
Expand All @@ -55,7 +56,7 @@ var installLimiter = rateLimit({
var waitApiMin = isDev ? 1: 15;
var apiLimiter = rateLimit({
store: (isDev ? undefined : new MongoStore({
uri: 'mongodb://127.0.0.1:27017/apiLimiter',
uri: limiter + '/apiLimiter',
resetExpireDateOnChange: true, // Rolling
expireTimeMs: waitApiMin * 60 * 1000 // n minutes for mongo store
})),
Expand All @@ -70,7 +71,7 @@ var apiLimiter = rateLimit({
var waitAuthMin = isDev ? 1: 1440;
var authLimiter = rateLimit({
store: (isDev ? undefined : new MongoStore({
uri: 'mongodb://127.0.0.1:27017/authLimiter',
uri: limiter + '/authLimiter',
resetExpireDateOnChange: true, // Rolling
expireTimeMs: waitAuthMin * 60 * 1000 // n minutes for mongo store
})),
Expand All @@ -94,7 +95,7 @@ var authLimiter = rateLimit({
var waitCaptchaMin = isDev ? 1: 1440;
var captchaLimiter = rateLimit({
store: (isDev ? undefined : new MongoStore({
uri: 'mongodb://127.0.0.1:27017/captchaLimiter',
uri: limiter + '/captchaLimiter',
resetExpireDateOnChange: true, // Rolling
expireTimeMs: waitCaptchaMin * 60 * 1000 // n minutes for mongo store
})),
Expand All @@ -112,7 +113,7 @@ var captchaLimiter = rateLimit({
var listMin = isDev ? 1: 60;
var listLimiter = rateLimit({
store: (isDev ? undefined : new MongoStore({
uri: 'mongodb://127.0.0.1:27017/listLimiter',
uri: limiter + '/listLimiter',
resetExpireDateOnChange: true, // Rolling
expireTimeMs: listMin * 60 * 1000 // n minutes for mongo store
})),
Expand Down