launchpad-reviewers team mailing list archive

[Stuart Bishop <stuart.bishop@xxxxxxxxxxxxx>]

Stuart Bishop has proposed merging lp:~stub/launchpad/swift-librarian into lp:launchpad with lp:~stub/launchpad/mock-swift as a prerequisite.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #1257636 in Launchpad itself: "Swift backend for Librarian storage"
  https://bugs.launchpad.net/launchpad/+bug/1257636

For more details, see:
https://code.launchpad.net/~stub/launchpad/swift-librarian/+merge/200273

Scrub http_proxy from the Librarian environment, ensuring that it will not attempt Keystone or Swift connections via a proxy server.
-- 
https://code.launchpad.net/~stub/launchpad/swift-librarian/+merge/200273
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~stub/launchpad/swift-librarian into lp:launchpad.

=== modified file 'lib/lp/scripts/runlaunchpad.py'
--- lib/lp/scripts/runlaunchpad.py	2013-01-07 02:40:55 +0000
+++ lib/lp/scripts/runlaunchpad.py	2014-01-02 05:34:58 +0000
@@ -470,6 +470,14 @@
     config.generate_overrides()
     # Create the Librarian storage directory if it doesn't already exist.
     prepare_for_librarian()
+    # Turn off the http_proxy environment variable if it is set. We
+    # don't need it, but we do need to contact Keystone & Swift directly.
+    # We could use no_proxy, but this requires keeping it in sync with
+    # reality on dev, staging & production servers.
+    if 'http_proxy' in os.environ:
+        del os.environ['http_proxy']
+    if 'HTTP_PROXY' in os.environ:
+        del os.environ['HTTP_PROXY']
     pidfile = pidfile_path('librarian')
     cmd = [
         tachandler.twistd_script,