[or-cvs] [torflow/master 91/92] snakeinspector: Allow mail_interval = None for ignoring mail_interval

[mikeperry at torproject.org]

Author: John M. Schanck <john at anomos.info>
Date: Fri, 20 Aug 2010 16:50:41 -0400
Subject: snakeinspector: Allow mail_interval = None for ignoring mail_interval
Commit: 9584979216c3f45f17f2cd468c07ed744ec1643b

---
 NetworkScanners/ExitAuthority/snakeinspector.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/NetworkScanners/ExitAuthority/snakeinspector.py b/NetworkScanners/ExitAuthority/snakeinspector.py
index aac8c11..4269165 100755
--- a/NetworkScanners/ExitAuthority/snakeinspector.py
+++ b/NetworkScanners/ExitAuthority/snakeinspector.py
@@ -219,7 +219,9 @@ def main(argv):
        (not conf.proto or r.proto == conf.proto) and \
        (not conf.resultfilter or r.__class__.__name__ == conf.resultfilter):
       if conf.send_email:
-        if r.timestamp > now - mail_interval - 60:
+        if mail_interval and r.timestamp > now - mail_interval - 60:
+          by_proto.setdefault(r.proto, []).append(r)
+        elif not mail_interval:
           by_proto.setdefault(r.proto, []).append(r)
         continue
       try:
-- 
1.7.1