X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/c55ebf5c95eff81339fdfe2e7912fa163c14f9d7..9905bbf733542af5f0ac1e3d827fbb353b446beb:/utils/cron_ipanalyse.py diff --git a/utils/cron_ipanalyse.py b/utils/cron_ipanalyse.py index 35db7759..97bad8da 100755 --- 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 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: @@ -396,7 +396,7 @@ if __name__ == '__main__': 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()