Merge lp:~stub/launchpad/memcache into lp:launchpad

[Stuart Bishop]

Cache chunks of the Branches front page and update some hardcoded stats for 2010

Load chunks of the code frontpage from memcached. Currently this page consistently loads in 5-10 seconds. Once memcached is available for edge, we should see a significant improvement.

Also fix a drive by fix of Bug #536661 since I was editing the file.

[Michael Nelson (michael.nelson)]

Cool, I'm looking forward to finding places in soyuz to use the cache too!

With the abbreviations, is there any reason why we're not setting the title? Like:
<abbr title="Subversion">SVN</abbr>

Thanks stub.

review: Approve (code)

[Stuart Bishop (stub)]

Abbreviations with titles inside of <a> tags look sucky in the UI due to mouse over effects, so I'll leave that for now.

=== modified file 'lib/lp/code/templates/bazaar-index.pt'
--- lib/lp/code/templates/bazaar-index.pt	2009-08-28 01:31:51 +0000
+++ lib/lp/code/templates/bazaar-index.pt	2010-03-11 11:53:27 +0000
@@ -47,13 +47,13 @@
           # XXX mpt 20080222 bug=84913: This link should be changed to
           # the URL produced.
         </tal:XXX>
-        <a href="/+recently-imported-branches">over 1000
-        <abbr>CVS</abbr> and <abbr>SVN</abbr> projects</a>,
+        <a href="/+recently-imported-branches">over 2000
+        <abbr>CVS</abbr>, <abbr>SVN</abbr>, Git and Mercurial projects</a>,
         so you can use Bazaar with those too.
         (<a href="https://help.launchpad.net/Code">Read our guide</a>)
       </p>
 
-      <div id="project-cloud-preview">
+      <div id="project-cloud-preview" tal:content="cache:public,6 hours">
         <h2>Projects with active branches</h2>
         <a tal:repeat="product view/short_product_tag_cloud"
            tal:attributes="href product/url;
@@ -64,7 +64,8 @@
       </div>
 
       <div class="columns">
-        <div class="three column left" id="recent-imports">
+        <div class="three column left" id="recent-imports"
+              tal:content="cache:private,15 minutes">
           <h2>Recent imports</h2>
           <ul>
             <li tal:repeat="branch view/recently_imported_branches">
@@ -78,7 +79,8 @@
           </ul>
           <p><a href="/+recently-imported-branches">more&#8230;</a></p>
         </div>
-        <div class="three column middle" id="recently-registered">
+        <div class="three column middle" id="recently-registered"
+            tal:content="cache:private,3 minutes">
           <h2>Recently registered</h2>
           <ul>
             <li tal:repeat="branch view/recently_registered_branches">
@@ -92,7 +94,8 @@
           </ul>
           <p><a href="/+recently-registered-branches">more&#8230;</a></p>
         </div>
-        <div class="three column right" id="recently-changed">
+        <div class="three column right" id="recently-changed"
+            tal:content="cache:private,5 minutes">
           <h2>Recently changed</h2>
           <ul>
             <li tal:repeat="branch view/recently_changed_branches">
@@ -108,7 +111,7 @@
         </div>
       </div>
       <div class="clear"></div>
-      <div id="application-footer">
+      <div id="application-footer" tal:content="cache:public,30 minutes">
         <div>
           <strong tal:content="view/branch_count">123</strong>
           branches registered in

=== modified file 'utilities/page-performance-report.ini'
--- utilities/page-performance-report.ini	2010-02-03 14:52:44 +0000
+++ utilities/page-performance-report.ini	2010-03-11 11:53:27 +0000
@@ -1,4 +1,7 @@
 [categories]
+# Category -> Python regular expression.
+# Remeber to quote ?, ., + & ? characters to match litterally.
+# 'kodos' is useful for interactively testing regular expressions.
 All Launchpad=.
 
 Registry=^https?://(edge\.)?launchpad\.
@@ -15,6 +18,7 @@
 Bugs - Search=/\+bugs\?
 
 Code=^https?://code\.(edge\.)?launchpad\.
+Code - Front page=^https?://code.[^/]+/?(?:\?.*)?$
 Code - PPA Index=/\+archive/[^/]+$
 Code - Pillar Branches=^https?://code\.(edge\.)?launchpad\.[^/]+/\w[^/]*$
 Code - Branch Page=^https?://code\.(edge\.)?launchpad\.[^/]+/(~|%7E)[^/]+/[^/]+/[^/]+$