changeset 420:b4ff26eb2c43

adjusting some surge protection limits imported from: moin--main--1.5--patch-424
author Thomas Waldmann <tw@waldmann-edv.de>
date Sat, 04 Feb 2006 11:40:42 +0000
parents c4ed690602a9
children 8eefc299cf06
files ChangeLog MoinMoin/multiconfig.py MoinMoin/request.py
diffstat 3 files changed, 20 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Feb 03 21:49:50 2006 +0000
+++ b/ChangeLog	Sat Feb 04 11:40:42 2006 +0000
@@ -2,6 +2,20 @@
 # arch-tag: automatic-ChangeLog--arch@arch.thinkmo.de--2003-archives/moin--main--1.5
 #
 
+2006-02-04 12:40:42 GMT	Thomas Waldmann <tw@waldmann-edv.de>	patch-424
+
+    Summary:
+      adjusting some surge protection limits
+    Revision:
+      moin--main--1.5--patch-424
+
+    adjusting some surge protection limits
+    
+
+    modified files:
+     ChangeLog MoinMoin/multiconfig.py MoinMoin/request.py
+
+
 2006-02-03 22:49:50 GMT	Thomas Waldmann <tw@waldmann-edv.de>	patch-423
 
     Summary:
--- a/MoinMoin/multiconfig.py	Fri Feb 03 21:49:50 2006 +0000
+++ b/MoinMoin/multiconfig.py	Sat Feb 04 11:40:42 2006 +0000
@@ -300,10 +300,13 @@
     surge_action_limits = { # allow max. <count> <action> requests per <dt> secs
         # action: (count, dt)
         'show': (20, 60),
+        'raw': (20, 40),  # some people use this for css
+        'AttachFile': (60, 60),
+        'diff': (30, 60),
         'fullsearch': (5, 60),
         'edit': (10, 120),
-        'rss_rc': (1, 20),
-        'default': (60, 60),
+        'rss_rc': (1, 60),
+        'default': (30, 60),
     }
     surge_lockout_time = 3600 # secs you get locked out when you ignore warnings
     
--- a/MoinMoin/request.py	Fri Feb 03 21:49:50 2006 +0000
+++ b/MoinMoin/request.py	Sat Feb 04 11:40:42 2006 +0000
@@ -175,7 +175,7 @@
             return False
         
         limits = self.cfg.surge_action_limits
-        default_limit = self.cfg.surge_action_limits.get('default', (60, 60))
+        default_limit = self.cfg.surge_action_limits.get('default', (30, 60))
         
         now = int(time.time())
         surgedict = {}