resilient: makes sure that cgi script deletes temporary files, even on failure

stack/resilient/buildout.cfg

@@ -104,7 +104,7 @@ output = ${buildout:directory}/instance-frozen.cfg
 [resilient-web-takeover-cgi-script-download]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/resilient-web-takeover-cgi-script.py.in
-md5sum = c46c8e3e4ce4376c98ad2fc0e2ff0fe4
+md5sum = 9d258d41eeef66f44f361adaa15cbd71
 mode = 0644
 destination = ${buildout:directory}/resilient-web-takeover-cgi-script.py.in
 

stack/resilient/resilient-web-takeover-cgi-script.py.in

@@ -4,6 +4,7 @@ equeue_database = '${equeue:database}'
 equeue_lockfile = '${equeue:lockfile}'
 takeover_script = '${resiliency-takeover-script:wrapper-takeover}'
 
+import atexit
 import cgi
 import cgitb
 import datetime
@@ -21,12 +22,17 @@ else:
 
 cgitb.enable()
 
+def deleteTemporaryDirectory(path):
+  if os.path.exists(path):
+    shutil.rmtree(path)
+
 def getLatestBackupDate():
   """
   Get the date of the latest successful backup.
   """
   # Create a copy of the db (locked by equeue process)
   temporary_directory = tempfile.mkdtemp()
+  atexit.register(deleteTemporaryDirectory, temporary_directory)
   equeue_database_copy = os.path.join(temporary_directory, 'equeue.db')
   shutil.copyfile(equeue_database, equeue_database_copy)
   db = gdbm.open(equeue_database_copy)