From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 11 May 2018 20:44:15 +0000 (+0200)
Subject: only block bulks with ignored redirect
X-Git-Tag: deploy~331
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/c55ebf5c95eff81339fdfe2e7912fa163c14f9d7?ds=inline

only block bulks with ignored redirect
---

diff --git a/utils/cron_ipanalyse.py b/utils/cron_ipanalyse.py
index 4c66b001..35db7759 100755
--- a/utils/cron_ipanalyse.py
+++ b/utils/cron_ipanalyse.py
@@ -232,9 +232,9 @@ class IPstats:
         self.bad_ua = False
 
     def add_long(self, logentry):
+        self.long_total += 1
         if logentry.retcode == 301:
             return
-        self.long_total += 1
         if logentry.request is not None:
             self.long_api += 1
         if not self.bad_ua:
@@ -263,7 +263,7 @@ class IPstats:
             return None if self.long_total < 20 else 'block'
         if self.long_api > BLOCK_UPPER \
             or self.short_api > BLOCK_UPPER / 3 \
-            or self.short_total == self.redirected:
+            or (self.redirected > 100 and self.short_total == self.redirected):
                 # client totally overdoing it
                 return 'block'
         if was_bulked: