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..66d122cd0c110432bb7820600821c6205868dd4c 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:


@@ -397,6 +397,6 @@ if __name__ == '__main__':
     if blocked:
         fd.write(logstr % ('new block:', ', '.join(blocked)))
     for k,v in stats.items():
     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:
+        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.write(logstr % ('Warning ignored:', k))
     fd.close()