Issue 2722 - Don't report persistent errors with external APIs more often than once a day

globals/get_browser_versions.py

 import re
 import os
 import sys
 import json
 import urllib
 import errno
 import logging
 import time
 from xml.dom import minidom
 
@@ skipping 179 matching lines @@
         raise
       persistent_cache = {}
 
     cached_versions = persistent_cache.get(browser)
     now = time.mktime(time.gmtime())
     if exc_info:
       if not cached_versions:
         raise exc_info[0], exc_info[1], exc_info[2]
 
       versions = cached_versions
-      if now - versions['timestamp'] > 60*60*2:
+      if now > versions['fail_silently_until']:
+        versions['fail_silently_until'] = now + 60*60*24
         logging.warning('Failed to get %s versions, falling back to '
                         'cached versions', browser, exc_info=exc_info)
     else:
       # Determine previous version: If we recorded the version before and it
       # changed since then, the old current version becomes the new previous
       # version. If the version didn't change, use the cached previous version.
       current = versions['current']
       previous = None
       if cached_versions:
         cached_current = cached_versions['current']
         if cached_current != current:
           previous = cached_current
         else:
           previous = cached_versions['previous']
       versions['previous'] = previous
 
       # Remove duplicates from unreleased versions. Occasionally,
       # different channels are on the same version, but we want
       # to list each version only once.
       versions['unreleased'] = sorted(
         set(versions['unreleased']) - set(re.sub(r'(\.0*)+$', '', ver) for ver in (current, previous) if ver),
         key=key_by_version
       )
 
-      versions['timestamp'] = now
+      versions['fail_silently_until'] = now + 60*60*2
       persistent_cache[browser] = versions
-      file.seek(0)
-      json.dump(persistent_cache, file)
-      file.truncate()
+
+    file.seek(0)
+    json.dump(persistent_cache, file)
+    file.truncate()
 
   if not versions['previous']:
     logging.warning("Couldn't determine previous browser version, "
                     'please set %s.previous in %s', browser, filename)
 
   cache[browser] = versions
   return versions