← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~adeuring/launchpad/no-feng-shui-in-the-server-room into lp:launchpad/devel

 

Abel Deuring has proposed merging lp:~adeuring/launchpad/no-feng-shui-in-the-server-room into lp:launchpad/devel.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)


(11:49:07) lifeless: adeuring: regarding the librarian OOPS ID change
(11:49:14) lifeless: adeuring: could we just delete that template altogether ?
(11:49:20) lifeless: adeuring: and stop special casing it?
(11:49:43) adeuring: lifeless: yeah, I wondered too if we really needed it. but...
(11:49:51) adeuring: there might be one reason:
(11:49:58) lifeless: adeuring: if you'd like to delete it, +1 from me :)
(11:50:57) adeuring: lifeless: well, these errors involve another machine, the librarian server, so they can occur due to reasons like hardware failures, network problems etc
(11:51:09) lifeless: adeuring: so do all our requests.
(11:51:23) lifeless: adeuring: (the database server is another machine ...)
(11:51:28) adeuring: well, yes, but there one more machine involved that usually
(11:51:49) lifeless: true, but its not a unique thing
(11:51:53) lifeless: its just more of the same
(11:51:59) lifeless: global searches use google
(11:52:08) lifeless: gpg key checking uses the keyserver
(11:52:47) adeuring: hrmm, yeah... ok, I delete it. Though I'll be missing the "feng shui in the server room" message ;)
-- 
https://code.launchpad.net/~adeuring/launchpad/no-feng-shui-in-the-server-room/+merge/36427
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~adeuring/launchpad/no-feng-shui-in-the-server-room into lp:launchpad/devel.
=== removed file 'lib/canonical/launchpad/pagetests/standalone/xx-librarian-upload-errors.txt'
--- lib/canonical/launchpad/pagetests/standalone/xx-librarian-upload-errors.txt	2010-09-22 15:49:41 +0000
+++ lib/canonical/launchpad/pagetests/standalone/xx-librarian-upload-errors.txt	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-Librarian errors
-================
-
-Librarian errors are shown in a special error page. We record OOPSes
-for these failures and display the OOPS ID in the error message.
-
-    >>> from canonical.config import config
-    >>> post_data = r"""
-    ... POST /firefox/+bug/1/+addcomment HTTP/1.1
-    ... Authorization: Basic Zm9vLmJhckBjYW5vbmljYWwuY29tOnRlc3Q=
-    ... Content-Type: multipart/form-data; boundary=---------------------------482515227376903752137397980
-    ...
-    ... -----------------------------482515227376903752137397980
-    ... Content-Disposition: form-data; name="field.subject"
-    ...
-    ... Re: Firefox does not support SVG
-    ... -----------------------------482515227376903752137397980
-    ... Content-Disposition: form-data; name="field.comment"
-    ...
-    ... -----------------------------482515227376903752137397980
-    ... Content-Disposition: form-data; name="field.filecontent.used"
-    ...
-    ... -----------------------------482515227376903752137397980
-    ... Content-Disposition: form-data; name="field.filecontent"; filename="foo.txt"
-    ... Content-Type: text/plain
-    ...
-    ... file content
-    ...
-    ... -----------------------------482515227376903752137397980
-    ... Content-Disposition: form-data; name="field.patch.used"
-    ...
-    ... -----------------------------482515227376903752137397980
-    ... Content-Disposition: form-data; name="field.attachment_description"
-    ...
-    ... -----------------------------482515227376903752137397980
-    ... Content-Disposition: form-data; name="field.actions.save"
-    ...
-    ... Post Comment
-    ... -----------------------------482515227376903752137397980--
-    ... """
-    >>> real_upload_port = config.librarian.upload_port
-    >>> # We can force a Librarian error by setting the Librarian upload
-    >>> # port to the download port.
-    >>> config.librarian.update(
-    ...     [('upload_port', str(config.librarian.download_port))])
-    []
-    >>> response = http(post_data)
-    >>> print extract_text(response.getOutput())
-    HTTP/1.1 500 Internal Server Error
-    ...
-    We've recorded what happened. The error ID is:
-    OOPS-...
-    Traceback (most recent call last):
-    ...
-    UploadFailed: Server said: foo.txt 501 Not Implemented<br />
-    ...
-
-    >>> config.librarian.update(
-    ...     [('upload_port', str(real_upload_port))])
-    []

=== removed file 'lib/canonical/launchpad/templates/launchpad-librarianfailure.pt'
--- lib/canonical/launchpad/templates/launchpad-librarianfailure.pt	2010-09-22 15:49:41 +0000
+++ lib/canonical/launchpad/templates/launchpad-librarianfailure.pt	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml";
-  xmlns:tal="http://xml.zope.org/namespaces/tal";
-  xmlns:metal="http://xml.zope.org/namespaces/metal";
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n";
-  metal:use-macro="view/macro:page/locationless"
-  i18n:domain="launchpad"
->
-  <body>
-    <div class="top-portlet" metal:fill-slot="main">
-      <h1 class="exception">Sorry, you can't do this right now</h1>
-      <p>
-      Sorry, you can't upload or download files from Launchpad at the moment,
-      because we're doing feng shui in the server room.  Normal service will
-      resume within an hour.
-      </p>
-      <p>We've recorded what happened. The error ID is:
-        <tal:oops replace="structure view/oops_id_text" />
-      </p>
-      <tal:replace tal:replace="structure view/maybeShowTraceback" />
-    </div>
-  </body>
-</html>

=== modified file 'lib/canonical/launchpad/zcml/launchpad.zcml'
--- lib/canonical/launchpad/zcml/launchpad.zcml	2010-09-20 16:45:03 +0000
+++ lib/canonical/launchpad/zcml/launchpad.zcml	2010-09-23 10:16:02 +0000
@@ -118,15 +118,6 @@
       class="canonical.launchpad.webapp.error.TranslationUnavailableView"
       />
 
-  <!-- LibrarianFailure -->
-  <browser:page
-      for="canonical.librarian.interfaces.LibrarianFailure"
-      name="index.html"
-      permission="zope.Public"
-      template="../templates/launchpad-librarianfailure.pt"
-      class="canonical.launchpad.webapp.error.SystemErrorView"
-      />
-
   <!-- ReadOnlyModeViolation -->
   <browser:page
       for="canonical.launchpad.webapp.interfaces.ReadOnlyModeViolation"