Merge lp:~lifeless/launchpad/showtimes into lp:launchpad

[Robert Collins]

[r=sinzui][bug=715474] Permit showing server side render times in the visible page (controlled by feature flag visible_render_time).

With thanks to Huw for the javascript, this branch adds the server render time to the left of the logged in user. Its only shown when visible_render_time is set as a feature flag : so we can set this to team:launchpad and show it just for launchpad developers.

[Robert Collins (lifeless)]

This is a screenshot without huw's shininess improvement. http://people.ubuntu.com/~lifeless/showtime.png

[Curtis Hovey (sinzui)]

We discussed the Bugtask decorated resultset changes. They are from another branch that is already approved to land, So I only reviewed the base-layout and rendertime changes. These are good to land.

review: Approve (code)

=== modified file 'lib/canonical/launchpad/icing/style-3-0.css.in'
--- lib/canonical/launchpad/icing/style-3-0.css.in	2011-02-03 21:08:58 +0000
+++ lib/canonical/launchpad/icing/style-3-0.css.in	2011-02-09 05:43:36 +0000
@@ -1162,6 +1162,12 @@
     top: .5em;
     right: 1.5em;
     }
+#rendertime {
+    float: left;
+    margin: 0.2em 1.2em 0 0;
+    color: #666;
+    font-size: 77%;
+    }
 div.watermark-apps-portlet {
     clear: both;
     margin-bottom: .5em;

=== modified file 'lib/canonical/launchpad/pagetests/basics/user-requested-oops.txt'
--- lib/canonical/launchpad/pagetests/basics/user-requested-oops.txt	2010-09-01 18:55:59 +0000
+++ lib/canonical/launchpad/pagetests/basics/user-requested-oops.txt	2011-02-09 05:43:36 +0000
@@ -12,21 +12,25 @@
 
 The OOPS id is put into the comment at the end of the document.
 
-    >>> (page, summary) = browser.contents.split('</html>')
+    >>> (page, summary) = browser.contents.split('</body>')
     >>> print summary
+    ...
     <!-- ...
     At least ... actions issued in ... seconds OOPS-...
     <BLANKLINE>
     r...
     -->
+    ...
 
 The ++oops++ can be anywhere in the traversal.
 
     >>> browser.open("http://launchpad.dev/gnome-terminal/++oops++/trunk")
-    >>> (page, summary) = browser.contents.split('</html>')
+    >>> (page, summary) = browser.contents.split('</body>')
     >>> print summary
+    ...
     <!-- ...
     At least ... actions issued in ... seconds OOPS-...
     <BLANKLINE>
     r...
     -->
+    ...

=== modified file 'lib/canonical/launchpad/templates/launchpad-loginstatus.pt'
--- lib/canonical/launchpad/templates/launchpad-loginstatus.pt	2010-08-12 15:31:11 +0000
+++ lib/canonical/launchpad/templates/launchpad-loginstatus.pt	2011-02-09 05:43:36 +0000
@@ -9,6 +9,7 @@
 <div id="logincontrol" tal:condition="view/logged_in">
   <form action="+logout" method="post">
     <input type="hidden" name="loggingout" value="1" />
+    <div id="rendertime" tal:condition="request/features/visible_render_time">Loading... &bull;</div>
     <a tal:replace="structure request/lp:person/fmt:name_link" /> &bull;
     <input type="submit" name="logout" value="Log Out" />
   </form>

=== modified file 'lib/lp/app/browser/tests/base-layout.txt'
--- lib/lp/app/browser/tests/base-layout.txt	2010-11-05 17:24:55 +0000
+++ lib/lp/app/browser/tests/base-layout.txt	2011-02-09 05:43:36 +0000
@@ -125,9 +125,10 @@
 Page Diagnostics
 ----------------
 
-The page includes a comment after the document with diagnostic information.
+The page includes a comment after the body with diagnostic information.
 
-    >>> print html[html.index('</html>') + 7:]
+    >>> print html[html.index('</body>') + 7:]
+    ...
     <!--
       Facet name: overview
       Page type: locationless
@@ -135,10 +136,11 @@
       Has application tabs: False
       Has side portlets: False
       At least ... queries... issued in ... seconds
-      Features: {}
-      in scopes {}
+      Features: {...}
+      in scopes {...}
       r...
     -->
+    ...
 
 Page Headings
 -------------

=== modified file 'lib/lp/app/templates/base-layout.pt'
--- lib/lp/app/templates/base-layout.pt	2010-12-13 18:04:24 +0000
+++ lib/lp/app/templates/base-layout.pt	2011-02-09 05:43:36 +0000
@@ -169,7 +169,6 @@
     <metal:lp-client-cache
       use-macro="context/@@+base-layout-macros/lp-client-cache" />
   </body>
-</html>
 
 <tal:template>
   <tal:comment
@@ -189,4 +188,19 @@
     r${revno}
   --&gt;" />
 </tal:template>
+
+<tal:comment
+    tal:condition="request/features/visible_render_time"
+    define="render_time modules/canonical.launchpad.webapp.adapter/summarize_requests;"
+    replace='structure string:&lt;script type="text/javascript"&gt;
+  var render_time = "${render_time} &amp;bull;";
+  LPS.use("node", function(Y) {
+    Y.on("domready", function() {
+      var node = Y.one("#rendertime");
+      node.set("innerHTML", render_time);
+    });
+  });
+&lt;/script&gt;' />
+
+</html>
 </metal:page>

=== modified file 'lib/lp/services/features/flags.py'
--- lib/lp/services/features/flags.py	2011-01-13 22:09:52 +0000
+++ lib/lp/services/features/flags.py	2011-02-09 05:43:36 +0000
@@ -40,6 +40,10 @@
      '[on|off]',
      'redirect to private URLs instead of proxying',
      'off'),
+    ('visible_render_time',
+     'empty|nonempty',
+     'enables showing the page render overheads in the login widget',
+     ''),
     ])
 
 # The set of all flag names that are documented.

=== modified file 'lib/lp/services/features/rulesource.py'
--- lib/lp/services/features/rulesource.py	2011-01-05 21:15:31 +0000
+++ lib/lp/services/features/rulesource.py	2011-02-09 05:43:36 +0000
@@ -16,6 +16,7 @@
 
 from storm.locals import Desc
 
+from canonical.launchpad.webapp import adapter
 from lp.services.features.model import (
     FeatureFlag,
     getFeatureStore,
@@ -90,6 +91,19 @@
     """
 
     def getAllRulesAsTuples(self):
+        try:
+            # This LBYL may look odd but it is needed. Rendering OOPSes and
+            # timeouts also looks up flags, but doing such a lookup can
+            # will cause a doom if the db request is not executed or is
+            # canceled by the DB - and then results in a failure in
+            # zope.app.publications.ZopePublication.handleError when it
+            # calls transaction.commit.
+            # By Looking this up first, we avoid this and also permit
+            # code using flags to work in timed out requests (by appearing to
+            # have no rules).
+            adapter.get_request_remaining_seconds()
+        except adapter.RequestExpired:
+            return 
         store = getFeatureStore()
         rs = (store
                 .find(FeatureFlag)