summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/docs/112
-rw-r--r--lib/Multi/API.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/data/docs/11 b/data/docs/11
index ba27b2bb..eb7c3aae 100644
--- a/data/docs/11
+++ b/data/docs/11
@@ -53,7 +53,7 @@ server resources and prevent abuse of this service.</p>
<li>5 connections per IP. All connections that are opened after reaching this limit will be immediately closed.</li>
<li>3 connections per user. The login command will reply with a 'sesslimit' error when reaching this limit.</li>
<li>Each command currently returns at most 10 results. <i>TODO: make configurable?</i></li>
- <li>30 commands per minute per user. Server will reply with a 'throttled' error (type="cmd") when reaching this limit.</li>
+ <li>100 commands per 10 minutes per user. Server will reply with a 'throttled' error (type="cmd") when reaching this limit.</li>
<li>
1 second of SQL time per minute per user. SQL time is the total time taken to
run the database queries for each command. This depends on both the command
diff --git a/lib/Multi/API.pm b/lib/Multi/API.pm
index 5e9f71d2..101d8c29 100644
--- a/lib/Multi/API.pm
+++ b/lib/Multi/API.pm
@@ -49,7 +49,7 @@ sub spawn {
conn_per_ip => 5,
sess_per_user => 3,
tcp_keepalive => [ 120, 60, 3 ], # time, intvl, probes
- throttle_cmd => [ 2, 30 ], # interval between each command, allowed burst
+ throttle_cmd => [ 6, 100 ], # interval between each command, allowed burst
throttle_sql => [ 60, 1 ], # sql time multiplier, allowed burst (in sql time)
ipbans => [],
@_,