summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG2
-rw-r--r--HTTP/RateLimit.hs2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 6ad3e62..e4862ff 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@ keysafe (0.20160915) UNRELEASED; urgency=medium
* Reduce number of buckets in rate limiter, avoiding ones with very low
proof of work.
+ * Make rate limiter adapt to ongoing load more quickly -- every 15
+ minutes instead of every 60.
-- Joey Hess <id@joeyh.name> Wed, 14 Sep 2016 20:19:43 -0400
diff --git a/HTTP/RateLimit.hs b/HTTP/RateLimit.hs
index e58b543..3a17a5a 100644
--- a/HTTP/RateLimit.hs
+++ b/HTTP/RateLimit.hs
@@ -392,7 +392,7 @@ adjusterThread cfg storedir ratelimiter logger = forever $ do
delay (1000000 * intervalsecs)
checkRequestRate cfg storedir ratelimiter logger intervalsecs
where
- intervalsecs = 60*60
+ intervalsecs = 60*15
checkRequestRate :: ServerConfig -> Maybe LocalStorageDirectory -> RateLimiter -> Logger -> Integer -> IO ()
checkRequestRate cfg storedir ratelimiter logger intervalsecs = do