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

[Stuart Bishop]

[Stuart Bishop (stub)]

Log the full URL to the zserver tracelog. This allows us to generate much more useful reports from it.

[Guilherme Salgado (salgado)]

looks good

(although it'd look nicer if you used a new branch with one of those funny names you always come up with, instead of this 'trivial' one with tons of associated bugs/m-ps, which will end up polluting the revision email ;)

review: Approve (code)

=== modified file 'lib/canonical/launchpad/webapp/publication.py'
--- lib/canonical/launchpad/webapp/publication.py	2010-01-19 04:22:17 +0000
+++ lib/canonical/launchpad/webapp/publication.py	2010-01-29 12:05:29 +0000
@@ -28,8 +28,8 @@
 from storm.exceptions import DisconnectionError, IntegrityError
 from storm.zope.interfaces import IZStorm
 
+from zc.zservertracelog.interfaces import ITraceLog
 import zope.app.publication.browser
-
 from zope.app import zapi  # used to get at the adapters service
 from zope.app.publication.interfaces import BeforeTraverseEvent
 from zope.app.security.interfaces import IUnauthenticatedPrincipal
@@ -459,8 +459,15 @@
         notify(BeforeTraverseEvent(ob, request))
 
     def afterTraversal(self, request, ob):
-        """ We don't want to call _maybePlacefullyAuthenticate as does
-        zopepublication."""
+        """See zope.publisher.interfaces.IPublication.
+
+        This hook does not invoke our parent's afterTraversal hook
+        in zopepublication.py because we don't want to call
+        _maybePlacefullyAuthenticate.
+        """
+        # Log the URL including vhost information to the ZServer tracelog.
+        ITraceLog(request).log(request.getURL())
+
         assert hasattr(request, '_traversalticks_start'), (
             'request._traversalticks_start, which should have been set by '
             'beforeTraversal(), was not found.')