Changeset 114460 in webkit

Timestamp:

Apr 17, 2012, 4:08:05 PM (13 years ago)

Author:

ojan@chromium.org

Message:

Add caching to the flakiness dashboard json files
​https://bugs.webkit.org/show_bug.cgi?id=84198

Reviewed by Dirk Pranke.

• TestResultServer/handlers/testfilehandler.py:

(GetFile._get_file_list):
(GetFile._get_file_content):
(GetFile._get_file_content_from_key):
(GetFile._get_test_list_json):
(GetFile._serve_json):
Add a Last-Modified header and handle If-Modified-Since headers.
(GetFile.get):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestResultServer/handlers/testfilehandler.py (modified) (6 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-04-17  Ojan Vafai  <ojan@chromium.org>
+
+        Add caching to the flakiness dashboard json files
+        https://bugs.webkit.org/show_bug.cgi?id=84198
+
+        Reviewed by Dirk Pranke.
+
+        * TestResultServer/handlers/testfilehandler.py:
+        (GetFile._get_file_list):
+        (GetFile._get_file_content):
+        (GetFile._get_file_content_from_key):
+        (GetFile._get_test_list_json):
+        (GetFile._serve_json):
+        Add a Last-Modified header and handle If-Modified-Since headers.
+        (GetFile.get):
+
 2012-04-17  Anders Carlsson  <andersca@apple.com>
 

trunk/Tools/TestResultServer/handlers/testfilehandler.py

@@ -27 +27 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import time
 import logging
 import re
@@ -111 +112 @@
         if callback_name:
             json = template.render("templates/showfilelist.jsonp", template_values)
-            self._serve_json(_replace_jsonp_callback(json, callback_name))
+            self._serve_json(_replace_jsonp_callback(json, callback_name), files[0].date)
             return
         self.response.out.write(template.render("templates/showfilelist.html",
@@ -130 +131 @@
             logging.info("File not found, master %s, builder: %s, test_type: %s, name: %s.",
                          master, builder, test_type, name)
-            return None
-
-        return files[0].data
+            return None, None
+
+        return files[0].data, files[0].date
 
     def _get_file_content_from_key(self, key):
@@ -142 +143 @@
 
         file.load_data()
-        return file.data
+        return file.data, file.date
 
     def _get_test_list_json(self, master, builder, test_type):
@@ -153 +154 @@
         """
 
-        json = self._get_file_content(master, builder, test_type, "results.json")
+        json, date = self._get_file_content(master, builder, test_type, "results.json")
         if not json:
             return None
 
-        return JsonResults.get_test_list(builder, json)
-
-    def _serve_json(self, json):
+        return JsonResults.get_test_list(builder, json), date
+
+    def _serve_json(self, json, modified_date):
         if json:
+            if "If-Modified-Since" in self.request.headers:
+                old_date = self.request.headers["If-Modified-Since"]
+                if time.strptime(old_date, '%a, %d %b %Y %H:%M:%S %Z') == modified_date.utctimetuple():
+                    self.response.set_status(304)
+                    return
+
+            # The appengine datetime objects are naive, so they lack a timezone.
+            # In practice, appengine seems to use GMT.
+            self.response.headers["Last-Modified"] = modified_date.strftime('%a, %d %b %Y %H:%M:%S') + ' GMT'
             self.response.headers["Content-Type"] = "application/json"
             self.response.out.write(json)
@@ -188 +198 @@
 
         if key:
-            json = self._get_file_content_from_key(key)
+            json, date = self._get_file_content_from_key(key)
         elif name == "results.json" and test_list_json:
-            json = self._get_test_list_json(master, builder, test_type)
+            json, date = self._get_test_list_json(master, builder, test_type)
         else:
-            json = self._get_file_content(master, builder, test_type, name)
-
-        self._serve_json(_replace_jsonp_callback(json, callback_name))
+            json, date = self._get_file_content(master, builder, test_type, name)
+
+        self._serve_json(_replace_jsonp_callback(json, callback_name), date)