Merge pull request #241 from ocf/no-more-rebuild-spam

Reduce #rebuild spam

Author: singingtelegram

ircbot/plugin/debian_security.py

@@ -13,7 +13,7 @@
 
 
 def dsa_list():
-    req = requests.get('https://www.debian.org/security/dsa-long')
+    req = requests.get('https://www.debian.org/security/dsa-long', timeout=30)
     req.raise_for_status()
 
     root = ElementTree.fromstring(req.content)

ircbot/plugin/timer.py

@@ -7,18 +7,19 @@
 from ircbot.plugin import debian_security
 
 # Check for Debian security announcements every 5 minutes
-# If a check fails, we bump add another 5 minutes, until
-# the maximum of 30 minutes
+# If a check fails, we bump add another 10 minutes, until
+# the maximum of 120 minutes
 DSA_FREQ_DEFAULT = 5
-DSA_FREQ_BACKOFF = 5
-DSA_FREQ_MAX = 30
+DSA_FREQ_BACKOFF = 10
+DSA_FREQ_MAX = 120
 
 
 def register(bot):
     bot.add_thread(timer)
 
 
 def timer(bot):
+    exception_count = 0
     dsa_freq = DSA_FREQ_DEFAULT
 
     last_date = None
@@ -39,11 +40,15 @@ def timer(bot):
                 for line in debian_security.get_new_dsas():
                     bot.say('#rebuild', line)
 
+                # After a successful fetch, reset the exception count
+                exception_count = 0
                 # After a successful fetch, we reset timer to 5m
                 dsa_freq = DSA_FREQ_DEFAULT
         except Exception as ex:
-            error_msg = f'ircbot exception in timer: {ex}'
-            bot.say('#rebuild', error_msg)
+            exception_count += 1
+            error_msg = f'ircbot exception in timer: {ex}, this error occurred {exception_count} times.'
+            if exception_count > 9:
+                bot.say('#rebuild', error_msg)
             bot.handle_error(
                 dedent(
                     """