X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/cb3a8db02575d3ba4ca24e45a83b4d8dc4edb0c9..23ae00a8c91b7ebbcefd9a79193402171da3e003:/utils/cron_banip.py

diff --git a/utils/cron_banip.py b/utils/cron_banip.py
index 4fe30640..ad32b852 100755
--- a/utils/cron_banip.py
+++ b/utils/cron_banip.py
@@ -65,6 +65,7 @@ BLOCK_LOWER=4000
 BLOCK_LOADFAC=380
 BULK_LOADFAC=160
 BULK_LOWER=1500
+MAX_BULK_IPS=85
 
 #
 # END OF DEFAULT SETTINGS
@@ -108,19 +109,19 @@ dbload = int(cur.fetchone()[0])
 
 BLOCK_LIMIT = max(BLOCK_LOWER, BLOCK_UPPER - BLOCK_LOADFAC * (dbload - 75))
 BULKLONG_LIMIT = max(BULK_LOWER, BULKLONG_LIMIT - BULK_LOADFAC * (avgload - 14))
-if len(prevbulks) > 85:
-    BLOCK_LIMIT = BLOCK_LOWER
+if len(prevbulks) > MAX_BULK_IPS:
+    BLOCK_LIMIT = max(3600, BLOCK_LOWER - (len(prevbulks) - MAX_BULK_IPS)*10)
 
 # get the new block candidates
 cur.execute("""
   SELECT ipaddress, max(count) FROM
    ((SELECT * FROM
-     (SELECT ipaddress, sum(case when endtime is null then 1 else 1+date_part('epoch',endtime-starttime) end) as count FROM new_query_log
+     (SELECT ipaddress, sum(case when endtime is null then 1 else 1+1.5*date_part('epoch',endtime-starttime) end) as count FROM new_query_log
       WHERE starttime > now() - interval '1 hour' GROUP BY ipaddress) as i
    WHERE count > %s)
    UNION
    (SELECT ipaddress, count * 3 FROM
-     (SELECT ipaddress, sum(case when endtime is null then 1 else 1+date_part('epoch',endtime-starttime) end) as count FROM new_query_log 
+     (SELECT ipaddress, sum(case when endtime is null then 1 else 1+1.5*date_part('epoch',endtime-starttime) end) as count FROM new_query_log 
       WHERE starttime > now() - interval '10 min' GROUP BY ipaddress) as i
    WHERE count > %s)) as o
   GROUP BY ipaddress