From 09a28438ebc18b93779b7dba6a35dd5a236ec801 Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <patrick@puiterwijk.org>
Date: Oct 19 2017 22:18:49 +0000
Subject: Make sure that the entire release object gets taken into account


Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>

---

diff --git a/alt.fedoraproject.org/build/fedimg_vars.py b/alt.fedoraproject.org/build/fedimg_vars.py
index 4db9a34..7e483a5 100755
--- a/alt.fedoraproject.org/build/fedimg_vars.py
+++ b/alt.fedoraproject.org/build/fedimg_vars.py
@@ -14,6 +14,7 @@ from __future__ import print_function
 import collections
 import functools
 from datetime import datetime, timedelta
+from hashlib import sha1
 import logging
 import shelve
 import os
@@ -24,12 +25,12 @@ logging.basicConfig(level=logging.INFO)
 
 log = logging.getLogger('fedimg_vars')
 
-cachefile = '/tmp/fedora_websites_fedimg_alt_%s_%s.cache'
+cachefile = '/tmp/fedora_websites_fedimg_alt_%s.cache'
 
 
 # We cache this guy on disk for 500s
 def collect(release):
-    shelf = shelve.open(cachefile % (release['curr_cloud_AMI_id'], release['atomic_composedate']))
+    shelf = shelve.open(cachefile % (sha1(str(release)).hexdigest()))
     if shelf.get('timestamp') and shelf.get('timestamp') > (datetime.utcnow() - timedelta(hours=1)):
         log.info('Retrieving release data from shelf')
         toreturn = shelf['collected']
diff --git a/getfedora.org/build/fedimg_vars.py b/getfedora.org/build/fedimg_vars.py
index df572a7..4ba3bd3 100755
--- a/getfedora.org/build/fedimg_vars.py
+++ b/getfedora.org/build/fedimg_vars.py
@@ -14,6 +14,7 @@ from __future__ import print_function
 import collections
 import functools
 from datetime import datetime, timedelta
+from hashlib import sha1
 import logging
 import shelve
 import os
@@ -24,12 +25,12 @@ logging.basicConfig(level=logging.INFO)
 
 log = logging.getLogger('fedimg_vars')
 
-cachefile = '/tmp/fedora_websites_fedimg_getfedora_%s_%s.cache'
+cachefile = '/tmp/fedora_websites_fedimg_getfedora_%s.cache'
 
 
 # We cache this guy on disk for 500s
 def collect(release):
-    shelf = shelve.open(cachefile % (release['curr_cloud_AMI_id'], release['atomic_composedate']))
+    shelf = shelve.open(cachefile % (sha1(str(release)).hexdigest()))
     if shelf.get('timestamp') and shelf.get('timestamp') > (datetime.utcnow() - timedelta(hours=1)):
         log.info('Retrieving release data from shelf')
         toreturn = shelf['collected']