From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 30 Aug 2013 23:14:35 +0000 (+0200)
Subject: don't bulk ua banned ips
X-Git-Tag: deploy~589
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/c440ce4deaf5d26f3eeb961cf5000b29a157f20e

don't bulk ua banned ips
---

diff --git a/utils/cron_banip.py b/utils/cron_banip.py
index 17268bc1..c8fdd78c 100755
--- a/utils/cron_banip.py
+++ b/utils/cron_banip.py
@@ -168,15 +168,16 @@ for ip in prevblocks:
         deblockcandidates.add(ip)    
         
 for ip in prevbulks:
-    if ip in bulkips:
-        if bulkips[ip] > BLOCK_LIMIT:
-            newblocks.add(ip)
-            newlyblocked.append(ip)
+    if ip not in newblocks:
+        if ip in bulkips:
+            if bulkips[ip] > BLOCK_LIMIT:
+                newblocks.add(ip)
+                newlyblocked.append(ip)
+            else:
+                newbulks.add(ip)
+            del bulkips[ip]
         else:
-            newbulks.add(ip)
-        del bulkips[ip]
-    else:
-        debulkcandidates.add(ip)
+            debulkcandidates.add(ip)
 
 # cross-check deblock candidates
 if deblockcandidates: