Merge remote-tracking branch 'upstream/master'

[nominatim.git] / utils / cron_ipanalyse.py

diff --git a/utils/cron_ipanalyse.py b/utils/cron_ipanalyse.py
index 35db77595ddcff0788fdfec89867499fdd28d635..97bad8da118e96b1f4287873919287389a3e2cd8 100755 (executable)
--- a/utils/cron_ipanalyse.py
+++ b/utils/cron_ipanalyse.py
@@ -253,8 +253,8 @@ class IPstats:
     def add_block(self, logentry):
         self.block_total += 1
 
     def add_block(self, logentry):
         self.block_total += 1
 

-    def ignores_warnings(self):
-        return self.block_total > 5
+    def ignores_warnings(self, wasblocked):
+        return self.block_total > 5 or (wasblocked and self.redirected > 5)

 
     def new_state(self, was_blocked, was_bulked):
         if was_blocked:
 
     def new_state(self, was_blocked, was_bulked):
         if was_blocked:


@@ -396,7 +396,7 @@ if __name__ == '__main__':
         fd.write(logstr % (' ua block:', ', '.join(uablocked)))
     if blocked:
         fd.write(logstr % ('new block:', ', '.join(blocked)))
         fd.write(logstr % (' ua block:', ', '.join(uablocked)))
     if blocked:
         fd.write(logstr % ('new block:', ', '.join(blocked)))

-    for k,v in stats.items():
-        if v.ignores_warnings() and k not in notlogged and ':' not in k:
-            fd.write(logstr % ('Warning ignored:', k))
+    #for k,v in stats.items():
+    #    if v.ignores_warnings(k in bl.prevblocks) and k not in notlogged and ':' not in k:
+    #        fd.write(logstr % ('Warning ignored:', k))

     fd.close()
     fd.close()